diff --git a/adm/views.py b/adm/views.py
index bd3b42f..29ad489 100644
--- a/adm/views.py
+++ b/adm/views.py
@@ -664,21 +664,6 @@ class AdmAddBreak(CreateView):
 		return reverse('adm-workday-update', kwargs={'pk': self.kwargs['pk']})
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 '''
 	IMPORT AGENCY
 '''
diff --git a/dasettings/templates/dasettings/groups_content.html b/dasettings/templates/dasettings/groups_content.html
index c03f0f9..2df840e 100644
--- a/dasettings/templates/dasettings/groups_content.html
+++ b/dasettings/templates/dasettings/groups_content.html
@@ -89,10 +89,11 @@
         {% for user in usersofagency %}   
           {% for group in user.groups.all %}  
             {% if group.name == aggroup.group.name %}                             
-            {% if request.user == user and aggroup.is_admin %}
+            {% if request.user == user and aggroup.is_admin or aggroup.agencygroupname == "Mitarbeiter" %}
             <span class="badge badge-pill badge-primary mr-2 mt-2"><button class="btn btn-primary" disabled="true">{{ user.first_name }} {{ user.last_name }}</button></span>
             {% else %}
-              <span id="span_btn_{{user.pk}}_{{aggroup.pk}}" class="badge badge-pill badge-primary mr-2 mt-2"><a  class="btn btn-primary" onclick="javascript:removeUserFromGroup({{ user.pk }}, {{aggroup.pk}})">{{ user.first_name }} {{ user.last_name }}&nbsp;&nbsp;<i class="fas fa-times"></i></a >       
+              <span id="span_btn_{{user.pk}}_{{aggroup.pk}}" class="badge badge-pill badge-primary mr-2 mt-2">
+                <a  class="btn btn-primary" onclick="javascript:removeUserFromGroup({{ user.pk }}, {{aggroup.pk}})">{{ user.first_name }} {{ user.last_name }}&nbsp;&nbsp;<i class="fas fa-times"></i></a >       
               </span>
               {% endif %}
             {% endif %}                      
@@ -352,9 +353,9 @@ function changeGroupName(groupid){
         { 
           $("#newgroupname").val(data['data']['groupname']);
           $("#modTitle").html("Gruppenname ändern");
-      $("#saveNewGroup").prop("disabled", false); 
-      groupupdate_id = groupid;
-      groupaction = 1;  
+          $("#saveNewGroup").prop("disabled", false); 
+          groupupdate_id = groupid;
+          groupaction = 1;  
         }
      });
 }
diff --git a/dasettings/views.py b/dasettings/views.py
index 14426b6..91da9d8 100644
--- a/dasettings/views.py
+++ b/dasettings/views.py
@@ -670,18 +670,29 @@ def SettingsAjaxRouter(request):
 			data = {"newvalue" : group.agencygroupname}
 
 			# Update Groupname in NC
+			'''
 			headers = {
-			'Accept' : 'application/json',
-			'Access-Control-Allow-Headers' : 'OCS-APIRequest',
-			'OCS-APIRequest' :  'true'
+				'Accept' : 'application/json',
+				'Access-Control-Allow-Headers' : 'OCS-APIRequest',
+				'OCS-APIRequest' :  'true',
 			}
+			'''
+			'''
 			data_nc = {
 				"groupid" : group.nc_name,
 				"newvalue" : request.GET['newvalue']
 			}
-			r = requests.post(settings.NEXTCLOUD_URL +  "/apps/agency/updateagencygroup", data=data_nc, headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API))
+			'''
+			#r = requests.post(settings.NEXTCLOUD_URL +  "/apps/agency/updateagencygroup", data=data_nc, headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API))
 
+			data = {
+				"name": request.GET['newvalue'],
+				"id" : group.nc_name
+			}
+			r = requests.post(settings.NEXTCLOUD_URL + "ocs/v2.php/apps/da_agency/api/v1/renameagg?format=json", auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API), data=data)
+			#r = requests.post(settings.NEXTCLOUD_URL +  "/apps/agency/api/v1/renameagg", data=data_nc, headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API))
 			success = True
+			data = {"newvalue" : request.GET['newvalue']}
 		else:
 			success = False
 	# GRUPPENNAMEN HOLEN
@@ -726,7 +737,11 @@ def SettingsAjaxRouter(request):
 			#data_nc = {
 			#	"groupid" : nc_groupid
 			#}
-			
+			data = {
+				"name": tempgroup_ag.agencygroupname,
+				"id" : nc_groupid
+			}
+			r = requests.post(settings.NEXTCLOUD_URL + "ocs/v2.php/apps/da_agency/api/v1/renameagg?format=json", auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API), data=data)
 			#r = requests.post(settings.NEXTCLOUD_URL +  "ocs/v1.php/cloud/users/" + request.user.username + "/groups", data=data_nc, headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API))
 			
 		else:
@@ -951,7 +966,6 @@ def SettingsAjaxRouter(request):
 					"key" : "email",
 					"value" : newmail
 					}
-					print(data_nc)
 					r = requests.put(settings.NEXTCLOUD_URL +  "/ocs/v1.php/cloud/users/" + tempuser.username,headers=headers, auth=(settings.NEXTCLOUD_USER_API, settings.NEXTCLOUD_PW_API), data=data_nc)
 					print(r.text)
 					success = True
diff --git a/users/views.py b/users/views.py
index eb4fc35..908d67e 100644
--- a/users/views.py
+++ b/users/views.py
@@ -101,6 +101,7 @@ def create_group_id(agencygroupname, agency):
 	
 	return newgroupid
 
+# TODO: Hier checken, ob die Registrierung klappt!
 def createNewAgencyByNC(request, uid):
 	print("CREATE NEW AGENCY")
 	# Creating Agency and prepare basic-Structure