diff --git a/bin/account-manager-client.pl b/bin/account-manager-client.pl
index ae6ad372e2f03e753c3bdfb6d41e263636af659d..eee0ffc62827075a13af82def59886c304c21f4a 100755
--- a/bin/account-manager-client.pl
+++ b/bin/account-manager-client.pl
@@ -36,6 +36,9 @@ if ($options{'create_test_account'}) {
     unless (defined $test_account) {
         die "Failed to create test account";
     }
+    
+    printf "Account created:\n\tuserid: user%d\n\tpassword: %s\n", $test_account->id, $test_account->user_password;
+    
 }elsif ($options{'list_test_accounts'}) {
     
     my %args;
diff --git a/lib/IdPAccountManager/TestAccount.pm b/lib/IdPAccountManager/TestAccount.pm
index aee85a929a6a45c91df3806a9e6ea66a73e9c0d3..b55321b93909bd34715af07c1345ee69b80605a8 100644
--- a/lib/IdPAccountManager/TestAccount.pm
+++ b/lib/IdPAccountManager/TestAccount.pm
@@ -21,6 +21,14 @@ has 'sp_entityid' => (is => 'rw',
                       isa => 'entityid',
                       required => 1,
                       );
+has 'id' => (is => 'ro',
+             isa => 'Int',
+             required => 0,
+             );
+has 'user_password' => (is => 'ro',
+                        isa => 'Str',
+                        required => 0,
+             );
 
 sub BUILD {
     
diff --git a/templates/accountProfiles/valid-accounts.php.tt2 b/templates/accountProfiles/valid-accounts.php.tt2
index 7195810f53ce6f51e83cc9a3ff9690081b1449e3..2f6a3630f98d6d86ba64456c11ba399b703e3da5 100644
--- a/templates/accountProfiles/valid-accounts.php.tt2
+++ b/templates/accountProfiles/valid-accounts.php.tt2
@@ -1,3 +1,4 @@
+<?php
 // template for a PhP configuration file loaded in simpleSamlPhp authsources.php file
 $validTestAccounts = array (
     'exampleauth:UserPass',