diff --git a/settings/js/users.js b/settings/js/users.js
index efa08cd0ba1..4c9aedd0e27 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -11,7 +11,7 @@ $(document).ready(function(){
 					return false;
 				}
 				$.post(
-					OC.filePath('admin','ajax','togglegroups.php'),
+					OC.filePath('settings','ajax','togglegroups.php'),
 					{
 						username:user,
 						group:group
@@ -36,7 +36,7 @@ $(document).ready(function(){
 	$('td.remove>img').live('click',function(event){
 		var uid=$(this).parent().parent().data('uid');
 		$.post(
-			OC.filePath('admin','ajax','removeuser.php'),
+			OC.filePath('settings','ajax','removeuser.php'),
 			{username:uid},
 			function(result){
 			
@@ -57,7 +57,7 @@ $(document).ready(function(){
 			if(event.keyCode == 13) {
 				if($(this).val().length>0){
 					$.post(
-						OC.filePath('admin','ajax','changepassword.php'),
+						OC.filePath('settings','ajax','changepassword.php'),
 						{username:uid,password:$(this).val()},
 						function(result){}
 					);
@@ -82,7 +82,7 @@ $(document).ready(function(){
 		var password=$('#newuserpassword').val();
 		var groups=$('#newusergroups').prev().children('div').data('settings').checked;
 		$.post(
-			OC.filePath('admin','ajax','createuser.php'),
+			OC.filePath('settings','ajax','createuser.php'),
 			{
 				username:username,
 				password:password,
@@ -104,7 +104,7 @@ $(document).ready(function(){
 		});
 		tr.find('td.groups').append(select);
 		if(tr.find('td.remve img').length==0){
-			tr.find('td.remove').append($('<img alt="Remove" title="'+t('admin','Remove')+'" class="svg action" src="'+OC.imagePath('core','actions/delete')+'"/>'));
+			tr.find('td.remove').append($('<img alt="Remove" title="'+t('settings','Remove')+'" class="svg action" src="'+OC.imagePath('core','actions/delete')+'"/>'));
 		}
 		applyMultiplySelect(select);
 		$('#content table tr').last().after(tr);
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 7a99c0eb412..5919ccb7dfa 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -22,7 +22,7 @@ foreach($_["groups"] as $group) {
 			<td class="name"><?php echo $user["name"]; ?></td>
 			<td class="password">
 				<span>●●●●●●●</span>
-				<img class="svg action" src="<?php echo image_path('core','actions/rename')?>"/>
+				<img class="svg action" src="<?php echo image_path('core','actions/rename.svg')?>"/>
 			</td>
 			<td class="groups">
 				<select data-username="<?php echo $user['name'] ;?>" data-user-groups="<?php echo $user['groups'] ;?>" data-placeholder="groups" title="<?php echo $l->t('Groups')?>" multiple="multiple">
@@ -33,7 +33,7 @@ foreach($_["groups"] as $group) {
 			</td>
 			<td class="remove">
 				<?php if($user['name']!=OC_User::getUser()):?>
-					<img alt="Remove" title="<?php echo $l->t('Remove')?>" class="svg action" src="<?php echo image_path('core','actions/delete') ?>" />
+					<img alt="Remove" title="<?php echo $l->t('Remove')?>" class="svg action" src="<?php echo image_path('core','actions/delete.svg') ?>" />
 				<?php endif;?>
 			</td>
 		</tr>