diff --git a/core/admin.py b/core/admin.py
index 3e21527..11522ac 100644
--- a/core/admin.py
+++ b/core/admin.py
@@ -1,13 +1,35 @@
 from django.contrib import admin
 
+from .forms import CustomUserChangeForm, CustomUserCreationForm
 
 from . import models
+from .forms import CustomUserChangeForm, CustomUserCreationForm
 # Register your models here.
 
+from django.contrib.auth import get_user_model
+
+User = get_user_model()
+
 
 class UserAdmin(admin.ModelAdmin):
+    add_form = CustomUserCreationForm
+    form = CustomUserChangeForm
+    model = User
+
     list_display = ('email', 'full_name', 'role', 'company', 'email_verified', 'is_active', 'is_staff', 'created', 'last_visit')
     list_filter = ('is_active', 'is_staff', 'email_verified')
-    search_fields = ('email', 'full_name', 'company')
+    search_fields = ('email', 'full_name', 'company__short_name')
+
+    fieldsets = (
+        (None, {'fields': ('email', 'password','full_name', 'role', 'notify','provider','email_verified','company','is_active')}),
+        ('Permissions', {'fields': ('is_staff', 'groups')}),
+    )
+
+    add_fieldsets = (
+        (None, {
+            'classes': ('wide',),
+            'fields': ('email', 'password1', 'password2', 'is_staff', 'is_active')}
+        ),
+    )
 
 admin.site.register(models.CustomUser, UserAdmin)
diff --git a/core/forms.py b/core/forms.py
new file mode 100644
index 0000000..ddf7731
--- /dev/null
+++ b/core/forms.py
@@ -0,0 +1,27 @@
+from django import forms
+from django.contrib.auth.forms import UserChangeForm, UserCreationForm
+from django.forms import ModelForm
+from django.contrib.auth import get_user_model
+
+User = get_user_model()
+
+
+class CustomUserCreationForm(UserCreationForm):
+
+    class Meta(UserCreationForm.Meta):
+
+        model = User
+
+        UserCreationForm.Meta.fields = ('email',)
+        fields = UserCreationForm.Meta.fields + ('full_name','role', 'notify', 'provider', 'email_verified', 'company', 'is_active', 'is_staff')
+        UserCreationForm.Meta.fields = ('password1','password2',)
+
+
+class CustomUserChangeForm(UserChangeForm):
+
+    class Meta(UserChangeForm.Meta):
+        model = User
+        UserChangeForm.Meta.fields = ('email',)
+        fields = UserChangeForm.Meta.fields + ('full_name','role', 'notify', 'provider', 'email_verified', 'company', 'is_active', 'is_staff')
+        UserChangeForm.Meta.fields = ('password1','password2',)
+