diff --git a/bin/account-manager-web.pl b/bin/account-manager-web.pl
index d7c1f5151ff98f0069f870b4d128eecdb19cae71..3bc880ced8d934d640143fabf0998e4e8154f8fe 100755
--- a/bin/account-manager-web.pl
+++ b/bin/account-manager-web.pl
@@ -33,7 +33,7 @@ my %format = (
 	      );
 
 my %actions = ('select_sp' => {'title_en' => 'Select your Service Provider'    },
-               'get_sp_list' => {'title_en' => 'Select your Service Provider'    },
+               'account_wizard' => {'title_en' => 'Select your Service Provider'    },
                'generate_token' => {'title_en' => 'Generate an authentication token'},
                'validate_token' => {'title_en' => 'Validate an authentication token'},
     );
@@ -110,7 +110,7 @@ sub new {
   }else {
     ## Default action
     &IdPAccountManager::Tools::do_log('info', "Default action");
-    $request->{'action'} = 'get_sp_list';
+    $request->{'action'} = 'account_wizard';
   }
         
   bless $request, $pkg;
@@ -229,8 +229,8 @@ sub respond {
    }
 }
 
-## Return the list of known SPs
-sub req_get_sp_list {
+## Return the list of known SPs first
+sub req_account_wizard {
     my $self = shift;
     &IdPAccountManager::Tools::do_log('info', "");
 
diff --git a/templates/web/get_sp_list.tt2.html b/templates/web/account_wizard.tt2.html
similarity index 100%
rename from templates/web/get_sp_list.tt2.html
rename to templates/web/account_wizard.tt2.html
diff --git a/templates/web/content.tt2.html b/templates/web/content.tt2.html
index 3e9714208657b32603be52996c1fe332c2283b0d..94325662a310605686685847c3b84c7ff981a72e 100644
--- a/templates/web/content.tt2.html
+++ b/templates/web/content.tt2.html
@@ -7,9 +7,9 @@
   An error occured
  [% END %]
 
-[% ELSIF action == 'get_sp_list' %]
+[% ELSIF action == 'account_wizard' %]
  [% TRY %]
-  [% PROCESS 'templates/web/get_sp_list.tt2.html' %]
+  [% PROCESS 'templates/web/account_wizard.tt2.html' %]
  [% CATCH %]
   An error occured
  [% END %]