diff --git a/controllers/account.go b/controllers/account.go
index 194151dd..1df84639 100644
--- a/controllers/account.go
+++ b/controllers/account.go
@@ -197,7 +197,7 @@ func (c *ApiController) UploadAvatar() {
 		c.ServeJSON()
 		return
 	}
-	user.Avatar = fmt.Sprintf("%s%s.png?time=%s", object.GetAvatarPath(), user.Name, util.GetCurrentUnixTime())
+	user.Avatar = fmt.Sprintf("%s%s.png?time=%s", object.GetAvatarPath(), user.GetId(), util.GetCurrentUnixTime())
 	object.UpdateUser(user.GetId(), user)
 	resp = Response{Status: "ok", Msg: ""}
 	c.Data["json"] = resp
diff --git a/object/oss.go b/object/oss.go
index b6791831..a1bd7f02 100644
--- a/object/oss.go
+++ b/object/oss.go
@@ -116,10 +116,11 @@ func UploadAvatar(username string, avatar []byte) string {
 			return "oss error"
 		}
 	}
-	_, err := storage.Put("/casdoor/avatar/" + username + ".png", bytes.NewReader(avatar))
+
+	path := fmt.Sprintf("/casdoor/avatar/%s.png", username)
+	_, err := storage.Put(path, bytes.NewReader(avatar))
 	if err != nil {
 		panic(err)
-		return "oss error"
 	}
 	return ""
 }