diff --git a/lib/AccountManager/Account.pm b/lib/AccountManager/Account.pm
index f89f1202864c9c4d887c3f2efa254ef2be376bb6..61e05d716d1359263ee47d955e567c4544b3e49f 100644
--- a/lib/AccountManager/Account.pm
+++ b/lib/AccountManager/Account.pm
@@ -138,16 +138,14 @@ sub eduPersonAffiliation {
     my ($self) = @_;
     my $affiliations = $affiliation{$self->profile()} || [];
 
-    return join(', ', @$affiliations);
+    return @$affiliations;
 }
 
 sub eduPersonScopedAffiliation {
     my ($self) = @_;
     my $affiliations = $scopedAffiliation{$self->profile()} || [];
 
-    $affiliations = [ map { $_ . '@' . $self->{scope} } @$affiliations ];
-
-    return join(', ', @$affiliations);
+    return map { $_ . '@' . $self->{scope} } @$affiliations;
 }
 
 sub eduPersonPrincipalName {