diff --git a/conf/app.ini b/conf/app.ini
index 6095ce284a..9d9e53dc1b 100644
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -303,7 +303,7 @@ SCHEDULE = @every 1h
 [cron.repo_health_check]
 SCHEDULE = @every 24h
 TIMEOUT = 60s
-; Arguments for command 'git fsck', e.g.: "--unreachable --tags"
+; Arguments for command 'git fsck', e.g. "--unreachable --tags"
 ; see more on http://git-scm.com/docs/git-fsck/1.7.5
 ARGS = 
 
@@ -314,7 +314,7 @@ SCHEDULE = @every 24h
 
 [git]
 MAX_GIT_DIFF_LINES = 10000
-; Arguments for command 'git gc', e.g.: "--aggressive --auto"
+; Arguments for command 'git gc', e.g. "--aggressive --auto"
 ; see more on http://git-scm.com/docs/git-gc/1.7.5
 GC_ARGS = 
 
diff --git a/routers/user/setting.go b/routers/user/setting.go
index 3cb9f0aece..b338e112ab 100644
--- a/routers/user/setting.go
+++ b/routers/user/setting.go
@@ -40,7 +40,7 @@ func Settings(ctx *middleware.Context) {
 }
 
 func handlerUsernameChange(ctx *middleware.Context, newName string) {
-	if len(newName) == 0 {
+	if len(newName) == 0 || !ctx.User.IsLocal() {
 		return
 	}