diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php
index 87b60e485b..4d248408db 100644
--- a/settings/ajax/togglegroups.php
+++ b/settings/ajax/togglegroups.php
@@ -60,9 +60,6 @@ if( OC_Group::inGroup( $username, $group )) {
 	$error = $l->t("Unable to remove user from group %s", $group);
 	$success = OC_Group::removeFromGroup( $username, $group );
 	$usersInGroup=OC_Group::usersInGroup($group);
-	if(count($usersInGroup) === 0) {
-		OC_Group::deleteGroup($group);
-	}
 }
 else{
 	$success = OC_Group::addToGroup( $username, $group );
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 4e686a6db8..5b12366ad4 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -470,17 +470,6 @@ var UserList = {
 								UserList.availableGroups.push(groupName);
 							}
 
-							// in case this was the last user in that group the group has to be removed
-							var groupElement = GroupList.getGroupLI(groupName);
-							var userCount = GroupList.getUserCount(groupElement);
-							if (response.data.action === 'remove' && userCount === 1) {
-								_.without(UserList.availableGroups, groupName);
-								GroupList.remove(groupName);
-								$('.groupsselect option').filterAttr('value', groupName).remove();
-								$('.subadminsselect option').filterAttr('value', groupName).remove();
-							}
-
-
 						}
 						if (response.data.message) {
 							OC.Notification.show(response.data.message);
diff --git a/settings/templates/users/part.grouplist.php b/settings/templates/users/part.grouplist.php
index 51638c7bcc..cd6ac4a1e8 100644
--- a/settings/templates/users/part.grouplist.php
+++ b/settings/templates/users/part.grouplist.php
@@ -43,9 +43,11 @@
 			</a>
 			<span class="utils">
 				<span class="usercount"><?php if($group['usercount'] > 0) { p($group['usercount']); } ?></span>
+				<?php if($_['isAdmin']): ?>
 				<a href="#" class="action delete" original-title="<?php p($l->t('Delete'))?>">
 					<img src="<?php print_unescaped(image_path('core', 'actions/delete.svg')) ?>" class="svg" />
 				</a>
+				<?php endif; ?>
 			</span>
 		</li>
 	<?php endforeach; ?>