diff --git a/sso/forms.py b/sso/forms.py
index 65fdc7f..3aa3517 100644
--- a/sso/forms.py
+++ b/sso/forms.py
@@ -30,13 +30,9 @@ def UserServiceAccountForm(user):
     """ Generate a Service Account form based on the user's permissions """
 
     services = Service.objects.filter(groups__in=user.groups.all())
-    choices = []
-
-    for service in services.all():
-        choices.append( ( service.name, service ) )
 
     class ServiceAccountForm(forms.Form):
-        service = forms.ChoiceField(choices=choices)
+        service = forms.ModelChoiceField(queryset=services)
         username = ServiceUsernameField(min_length=4,max_length=50)
         password = forms.CharField(label = u'Password',widget = forms.PasswordInput(render_value=False))