diff --git a/backend/account/admin.py b/backend/account/admin.py
index aad9be0..6ea35fa 100644
--- a/backend/account/admin.py
+++ b/backend/account/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 from .models import *
-from unfold.admin import ModelAdmin
+from unfold.admin import ModelAdmin, TabularInline
 from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
 from import_export.admin import ImportExportModelAdmin
 from unfold.contrib.import_export.forms import ExportForm, ImportForm, SelectableFieldsExportForm
@@ -8,12 +8,21 @@ from unfold.contrib.forms.widgets import ArrayWidget, WysiwygWidget
 from django.contrib.postgres.fields import ArrayField
 from django.contrib.auth.models import Group
 from unfold.forms import AdminPasswordChangeForm
+from unfold.forms import AdminPasswordChangeForm, UserChangeForm, UserCreationForm
 
+class UserAddressInLine(TabularInline):
+    model = UserAddressModel
+    extra = 0
+    tab = True
+    
 @admin.register(User)
 class UserAdmin(BaseUserAdmin, ModelAdmin, ImportExportModelAdmin):
-    
+    form = UserChangeForm
+    add_form = UserCreationForm
+    change_password_form = AdminPasswordChangeForm
     filter_horizontal = []
     ordering = []
+    inlines = [UserAddressInLine]
     list_filter = []
     search_fields = ['phone', 'first_name', 'last_name', ]
     list_display = ['phone', 'email', 'is_superuser']
@@ -22,10 +31,9 @@ class UserAdmin(BaseUserAdmin, ModelAdmin, ImportExportModelAdmin):
     exclude = ('otp_hash', 'otp_expiry', 'is_active', 'is_staff', 'password', 'last_login')
     import_form_class = ImportForm
     export_form_class = ExportForm
-    change_password_form = AdminPasswordChangeForm
     fieldsets = (
-        ('Personal info', {'fields': ('first_name', 'last_name', 'profile_photo')}),
-        ('contact', {'fields': ('phone', 'email')}),
+        ('Personal info', {'fields': ('first_name', 'last_name', 'profile_photo', 'password'),}),
+        ('contact', {'fields': ('phone', 'email'),}),
     )
     
     add_fieldsets = (