diff --git a/langs/english.json b/langs/english.json
index f2a93f6a..4b402049 100644
--- a/langs/english.json
+++ b/langs/english.json
@@ -797,6 +797,9 @@
 
 		"panel_user_head":"User Editor",
 		"panel_user_avatar":"Avatar",
+		"panel_user_avatar_select":"Select",
+		"panel_user_avatar_upload":"Upload",
+		"panel_user_avatar_remove":"Remove",
 		"panel_user_name":"Name",
 		"panel_user_name_placeholder":"Jane Doe",
 		"panel_user_password":"Password",
diff --git a/routes/panel/users.go b/routes/panel/users.go
index 2453205c..84f47374 100644
--- a/routes/panel/users.go
+++ b/routes/panel/users.go
@@ -167,6 +167,7 @@ func UsersAvatarSubmit(w http.ResponseWriter, r *http.Request, user c.User, suid
 	if ferr != nil {
 		return ferr
 	}
+	// TODO: Check the UploadAvatars permission too?
 	if !user.Perms.EditUser {
 		return c.NoPermissions(w, r, user)
 	}
diff --git a/templates/panel_user_edit.html b/templates/panel_user_edit.html
index d0cd2817..bf4344d0 100644
--- a/templates/panel_user_edit.html
+++ b/templates/panel_user_edit.html
@@ -11,9 +11,9 @@
 			{{if .Something.RawAvatar}}<img src="{{.Something.Avatar}}" height=56 width=56 />{{end}}
 			<div class="avatarbuttons">
 				<input form="avatar_form" id="select_avatar" name="avatar_file" type="file" required class="auto_hide" />
-				<label for="select_avatar" class="formbutton">Select</label>
-				<button form="avatar_form" name="avatar_action" value=0>Upload</button>
-				{{if .Something.RawAvatar}}<button form="remove_avatar_form" name="avatar_action" value=1>Remove</button>{{end}}
+				<label for="select_avatar" class="formbutton">{{lang "panel_user_avatar_select"}}</label>
+				<button form="avatar_form" name="avatar_action" value=0>{{lang "panel_user_avatar_upload"}}</button>
+				{{if .Something.RawAvatar}}<button form="remove_avatar_form" name="avatar_action" value=1>{{lang "panel_user_avatar_remove"}}</button>{{end}}
 			</div>
 		</div>
 	</div>