diff --git a/user_app/admin.py b/user_app/admin.py
index d53bbf6..7fbb5c0 100644
--- a/user_app/admin.py
+++ b/user_app/admin.py
@@ -4,23 +4,23 @@ from .models import User
 
 class UserAdmin(admin.ModelAdmin):
     exclude = ('uId',)
-    list_display = ('first_name', 'last_name', 'email', 'phone', 'initials', 'color', 'status', 'last_login', 'is_active', 'is_staff')
-    list_filter = ('status', 'is_active', 'is_staff')
+    list_display = ('first_name', 'last_name', 'email', 'phone', 'initials', 'color', 'is_online', 'is_contact_only', 'last_login', 'is_active', 'is_staff')
+    list_filter = ('is_contact_only', 'is_online', 'is_active', 'is_staff')
     search_fields = ('email', 'first_name', 'last_name')
 
     fieldsets = (
         (None, {
-            'fields': ('first_name', 'last_name', 'email', 'phone', 'password') #Passwort hier beibehalten.
+            'fields': ('first_name', 'last_name', 'email', 'phone', 'password')
         }),
         ('Additional Info', {
-            'fields': ('initials', 'color', 'status', 'last_login')
+            'fields': ('initials', 'color', 'is_online', 'is_contact_only', 'last_login')
         }),
         ('Permissions', {
             'fields': ('is_active', 'is_staff')
         }),
     )
 
-    list_editable = ('is_active', 'is_staff', 'status')
+    list_editable = ('is_active', 'is_staff', 'is_online', 'is_contact_only')
     ordering = ('last_name',)
 
     def save_model(self, request, obj, form, change):
diff --git a/user_app/models.py b/user_app/models.py
index 526e250..95c8d64 100644
--- a/user_app/models.py
+++ b/user_app/models.py
@@ -35,7 +35,8 @@ class User(AbstractBaseUser, PermissionsMixin):
     phone = models.CharField(max_length=20, blank=True, null=True)
     initials = models.CharField(max_length=10, blank=True)
     color = models.CharField(max_length=20, blank=True)
-    status = models.BooleanField(default=True)
+    is_online = models.BooleanField(default=False)
+    is_contact_only = models.BooleanField(default=False)
     last_login = models.DateTimeField(blank=True, null=True)
 
     is_active = models.BooleanField(default=True)
diff --git a/user_app/serializers.py b/user_app/serializers.py
index 162cb2b..98192a9 100644
--- a/user_app/serializers.py
+++ b/user_app/serializers.py
@@ -6,7 +6,7 @@ from djangorestframework_camel_case.render import CamelCaseJSONRenderer
 class UserSerializer(serializers.ModelSerializer):
     class Meta:
         model = User
-        fields = ['id', 'first_name', 'last_name', 'email', 'phone', 'initials', 'color', 'status', 'last_login']
+        fields = ['id', 'first_name', 'last_name', 'email', 'phone', 'initials', 'color', 'is_online', 'is_contact_only', 'last_login']
         
 class UserViewSet(viewsets.ModelViewSet):
     serializer_class = UserSerializer
diff --git a/user_app/views.py b/user_app/views.py
index 3d212b4..18133af 100644
--- a/user_app/views.py
+++ b/user_app/views.py
@@ -9,7 +9,7 @@ from rest_framework import status
 class UserViewSet(viewsets.ModelViewSet):
     permission_classes = [IsAuthenticated]
     
-    queryset = User.objects.all()
+    queryset = User.objects.filter(is_active=True, is_superuser=False)
     serializer_class = UserSerializer
     
     def retrieve(self, request, pk=None):