Refactor

As all points from the epic refactor issue are closed #47 (closed) I am merging this in to master in order to unblock development.

backend/core/admin.py

@@ -16,7 +16,7 @@ class UserCreationForm(forms.ModelForm):
 
     class Meta:
         model = UserAccount
-        fields = ()
+        fields = ('username',)
 
     def clean_password2(self):
         # Check that the two password entries match
@@ -44,7 +44,7 @@ class UserChangeForm(forms.ModelForm):
 
     class Meta:
         model = UserAccount
-        fields = ('password', 'is_active', 'is_admin')
+        fields = ('username', 'password', 'is_active', 'is_admin')
 
     def clean_password(self):
         return self.initial["password"]
@@ -62,14 +62,15 @@ class UserAdmin(BaseUserAdmin):
     list_filter = ('is_admin',)
     fieldsets = (
         (None, {'fields': ('password',)}),
-        ('Permissions', {'fields': ('is_admin',)}),
+        ('Permissions',
+            {'fields': ('username', 'password', 'is_admin', 'is_active')}),
     )
     # add_fieldsets is not a standard ModelAdmin attribute. UserAdmin
     # overrides get_fieldsets to use this attribute when creating a user.
     add_fieldsets = (
         (None, {
             'classes': ('wide',),
-            'fields': ('password1', 'password2')}
+            'fields': ('username', 'password1', 'password2')}
          ),
     )
     filter_horizontal = ()