diff --git a/colab/accounts/admin.py b/colab/accounts/admin.py
index 369b7e5..f55dd51 100644
--- a/colab/accounts/admin.py
+++ b/colab/accounts/admin.py
@@ -3,9 +3,10 @@ from django import forms
 from django.contrib import admin
 from django.contrib.auth import get_user_model
 from django.contrib.auth.admin import UserAdmin
-from django.contrib.auth.forms import UserCreationForm
 from django.utils.translation import ugettext_lazy as _
 
+from .forms import UserCreationForm
+
 User = get_user_model()
 
 
@@ -39,7 +40,7 @@ class MyUserAdmin(UserAdmin):
 
     fieldsets = (
         (None, {'fields': ('username', 'email', 'password')}),
-        (_('Personal info'), {'fields': ('first_name', 'last_name', 'twitter', 
+        (_('Personal info'), {'fields': ('first_name', 'last_name', 'twitter',
                                          'facebook', 'google_talk', 'webpage',
                              )}),
         (_('Permissions'), {'fields': ('is_active', 'is_staff', 'is_superuser',
diff --git a/colab/accounts/forms.py b/colab/accounts/forms.py
index b66e030..30c46d4 100644
--- a/colab/accounts/forms.py
+++ b/colab/accounts/forms.py
@@ -2,6 +2,8 @@
 
 from django import forms
 from django.contrib.auth import get_user_model
+from django.contrib.auth.forms import OrderedDict, ReadOnlyPasswordHashField, \
+    default_token_generator
 from django.utils.translation import ugettext_lazy as _
 
 from conversejs.models import XMPPAccount
--
libgit2 0.21.2