diff --git a/library/ajax/avatar.php b/library/ajax/avatar.php
index 8d729637e..4040bf9cc 100644
--- a/library/ajax/avatar.php
+++ b/library/ajax/avatar.php
@@ -21,7 +21,7 @@ if (!$user_id or !$u_data = get_userdata($user_id)) {
 }
 
 if (!IS_ADMIN && $user_id != $user->id) {
-    $this->ajax_die($lang['NOT_ADMIN']);
+    $this->ajax_die($lang['NOT_AUTHORISED']);
 }
 
 $new_ext_id = 0;
diff --git a/styles/templates/default/usercp_viewprofile.tpl b/styles/templates/default/usercp_viewprofile.tpl
index 4dcb9034e..5061f7de6 100644
--- a/styles/templates/default/usercp_viewprofile.tpl
+++ b/styles/templates/default/usercp_viewprofile.tpl
@@ -19,19 +19,6 @@ ajax.callback.edit_user_profile = function(data){
 	ajax.restoreEditable(data.edit_id, data.new_value);
 };
 
-// avatar
-ajax.avatar = function (mode, uid) {
-	ajax.exec({
-		action  : 'avatar',
-		mode    : mode,
-		user_id : uid
-	});
-};
-ajax.callback.avatar = function (data) {
-	$('#avatar-img').html(data.avatar_html);
-	$('#avatar-adm').hide();
-};
-
 // change_user_rank
 ajax.change_user_rank = function (uid, rank_id) {
 	$('#rank-msg').html('<i class="loading-1">{L_LOADING}</i>');
@@ -46,9 +33,9 @@ ajax.callback.change_user_rank = function (data) {
 	$('#rank-name').html(data.rank_name);
 };
 
+// change_user_opt
 ajax.user_opt = {AJAX_USER_OPT};
 
-// change_user_opt
 ajax.change_user_opt = function() {
 	ajax.exec({
 		action   : 'change_user_opt',
@@ -206,7 +193,21 @@ ajax.callback.index_data = function(data) {
 
 		<div id="avatar-img" class="mrg_4 med">
 			{AVATAR_IMG}
-			<!-- IF IS_ADMIN -->
+            <!-- IF IS_ADMIN || PROFILE_USER -->
+            <script type="text/javascript">
+                // avatar
+                ajax.avatar = function (mode, uid) {
+                    ajax.exec({
+                        action: 'avatar',
+                        mode: mode,
+                        user_id: uid
+                    });
+                };
+                ajax.callback.avatar = function (data) {
+                    $('#avatar-img').html(data.avatar_html);
+                    $('#avatar-adm').hide();
+                };
+            </script>
 			<p id="avatar-adm" class="med mrg_4">[ <a href="#" onclick="if (window.confirm('{L_AVATAR_DELETE}?')){ ajax.avatar('delete', {PROFILE_USER_ID}); } return false;" class="adm">{L_AVATAR_DELETE}</a> ]</p>
 			<!-- ENDIF -->
 		</div>