diff --git a/conf/default-Conf.pm b/conf/default-Conf.pm
index c5d5415fcc12e8a884494617fcd6216456756d34..08640a81a68d855988744223607816b0f21cc1e9 100644
--- a/conf/default-Conf.pm
+++ b/conf/default-Conf.pm
@@ -81,7 +81,7 @@ our %global = (
     'federation_metadata_file_path' => '/opt/testidp/IdPAccountManager/conf/edugain-md.xml',
     
     ## valid account profiles
-    'account_profiles' => ['student1','teacher1'],
+    'account_profiles' => ['student1','teacher1','alumni1','librarywalkin1','employee1','researcher1'],
 );
     
 1; # Magic true value required at end of module
diff --git a/templates/accountProfiles/alumni1.tt2 b/templates/accountProfiles/alumni1.tt2
new file mode 100644
index 0000000000000000000000000000000000000000..5e38fbc4b3a04798ffad1c91fb81f1ef72f15736
--- /dev/null
+++ b/templates/accountProfiles/alumni1.tt2
@@ -0,0 +1,16 @@
+[% account_sp_entityid = account.get('sp_entityid') %]
+[% account_id = account.get('id') %]
+
+[% SET account_profile = {
+  	'uid' => "${account_id}",
+	'eduPersonAffiliation' => ['alum'],
+	'eduPersonScopedAffiliation' => ["alum@${conf.idp_scope}"],
+        'displayName' => 'Ruby Anderson',
+        'cn' => 'Ruby Anderson',
+        'mail' => "ruby.anderson@${conf.idp_scope}",
+        'eduPersonPrincipalName' =>"${account_id}@${conf.idp_scope}",
+        'eduPersonTargetedID' =>"${conf.idp_entityid}!${account_sp_entityid}!X622UR2A7PG1uVhATobBOrMz+Ys=",
+        'schacHomeOrganization' => "${conf.idp_scope}",
+        'schacHomeOrganizationType' => 'urn:schac:homeOrganizationType:int:university',
+} %]
+
diff --git a/templates/accountProfiles/employee1.tt2 b/templates/accountProfiles/employee1.tt2
new file mode 100644
index 0000000000000000000000000000000000000000..5acc0c0d91b977a9b4c73b223381b331d085bba4
--- /dev/null
+++ b/templates/accountProfiles/employee1.tt2
@@ -0,0 +1,16 @@
+[% account_sp_entityid = account.get('sp_entityid') %]
+[% account_id = account.get('id') %]
+
+[% SET account_profile = {
+  	'uid' => "${account_id}",
+	'eduPersonAffiliation' => ['member','staff','employee'],
+	'eduPersonScopedAffiliation' => ["member@${conf.idp_scope}","staff@${conf.idp_scope}","employee@${conf.idp_scope}"],
+        'displayName' => 'Morgan Hsu',
+        'cn' => 'Morgan Hsu',
+        'mail' => "morgan.hsu@${conf.idp_scope}",
+        'eduPersonPrincipalName' =>"${account_id}@${conf.idp_scope}",
+        'eduPersonTargetedID' =>"${conf.idp_entityid}!${account_sp_entityid}!X622UR2A7PG1uVhATobBOrMz+Ys=",
+        'schacHomeOrganization' => "${conf.idp_scope}",
+        'schacHomeOrganizationType' => 'urn:schac:homeOrganizationType:int:university',
+} %]
+
diff --git a/templates/accountProfiles/librarywalkin1.tt2 b/templates/accountProfiles/librarywalkin1.tt2
new file mode 100644
index 0000000000000000000000000000000000000000..4141d52f4cb4d7a8bfa132ed733f2607e6121d64
--- /dev/null
+++ b/templates/accountProfiles/librarywalkin1.tt2
@@ -0,0 +1,17 @@
+[% account_sp_entityid = account.get('sp_entityid') %]
+[% account_id = account.get('id') %]
+
+[% SET account_profile = {
+  	'uid' => "${account_id}",
+	'eduPersonAffiliation' => ['library-walk-in'],
+	'eduPersonScopedAffiliation' => ["library-walk-in@${conf.idp_scope}"],
+        'displayName' => 'Dorian Segura',
+        'cn' => 'Dorian Segura',
+        'mail' => "dorian.segora@${conf.idp_scope}",
+        'eduPersonPrincipalName' =>"${account_id}@${conf.idp_scope}",
+        'eduPersonTargetedID' =>"${conf.idp_entityid}!${account_sp_entityid}!X622UR2A7PG1uVhATobBOrMz+Ys=",
+        'schacHomeOrganization' => "${conf.idp_scope}",
+        'schacHomeOrganizationType' => 'urn:schac:homeOrganizationType:int:university',
+	'eduPersonEntitlement' => 'urn:mace:dir:entitlement:common-lib-terms',
+} %]
+
diff --git a/templates/accountProfiles/researcher1.tt2 b/templates/accountProfiles/researcher1.tt2
new file mode 100644
index 0000000000000000000000000000000000000000..651a30051fed1622cb6894f66dfa23ef2af67355
--- /dev/null
+++ b/templates/accountProfiles/researcher1.tt2
@@ -0,0 +1,17 @@
+[% account_sp_entityid = account.get('sp_entityid') %]
+[% account_id = account.get('id') %]
+
+[% SET account_profile = {
+  	'uid' => "${account_id}",
+	'eduPersonAffiliation' => ['member', 'faculty'],
+	'eduPersonScopedAffiliation' => ["member@${conf.idp_scope}", "faculty@${conf.idp_scope}"],
+        'displayName' => 'Jean Valjean',
+        'cn' => 'Jean Valjean',
+        'mail' => "peter.smithjean.valjean@${conf.idp_scope}",
+        'eduPersonPrincipalName' =>"${account_id}@${conf.idp_scope}",
+        'eduPersonTargetedID' =>"${conf.idp_entityid}!${account_sp_entityid}!X622UR2A7PG1uVhATobBOrMz+Ys=",
+        'schacHomeOrganization' => "${conf.idp_scope}",
+        'schacHomeOrganizationType' => 'urn:schac:homeOrganizationType:int:public-research-institution',
+} %]
+
+
diff --git a/templates/accountProfiles/teacher1.tt2 b/templates/accountProfiles/teacher1.tt2
index 56a3977263dea41634df2202b4c9e79d62e23000..5f7ab5b4a5d58b8baff72adc742e505add1159c9 100644
--- a/templates/accountProfiles/teacher1.tt2
+++ b/templates/accountProfiles/teacher1.tt2
@@ -4,7 +4,7 @@
 [% SET account_profile = {
   	'uid' => "${account_id}",
 	'eduPersonAffiliation' => ['member', 'faculty'],
-	'eduPersonScopedAffiliation' => ["member@${conf.idp_scope}", "student@${conf.idp_scope}"],
+	'eduPersonScopedAffiliation' => ["member@${conf.idp_scope}", "faculty@${conf.idp_scope}"],
         'displayName' => 'Peter Smith',
         'cn' => 'Peter Smith',
         'mail' => "peter.smith@${conf.idp_scope}",