diff --git a/src/server/game/gm_handler.go b/src/server/game/gm_handler.go
index d02c51c8..752c68f3 100644
--- a/src/server/game/gm_handler.go
+++ b/src/server/game/gm_handler.go
@@ -540,7 +540,7 @@ func ReqGmCommand_(player *Player, Command string) error {
 		BaseMod.NickName = player.PlayMod.getBaseMod().NickName
 		BaseMod.Account = player.PlayMod.getBaseMod().Account
 		BaseMod.LoginTime = GoUtil.Now()
-		BaseMod.AddCode = fmt.Sprintf("MMM-%s-%s", "156", GoUtil.UniqueStringFromInt(int(BaseMod.Uid)))
+		BaseMod.AddCode = fmt.Sprintf("MMM-%s-%s", BaseMod.CountryCode, GoUtil.UniqueStringFromInt(int(BaseMod.Uid)))
 		// deep copy p1.PlayMod.mod_list to avoid sharing internal pointers
 		var modCopy PlayerModList
 		var buf bytes.Buffer
@@ -610,7 +610,7 @@ func ReqGmCommand_(player *Player, Command string) error {
 		player.ClearData()
 	case "resetCode":
 		BaseMod := player.PlayMod.getBaseMod()
-		BaseMod.AddCode = fmt.Sprintf("MMM-%s-%s", "156", GoUtil.UniqueStringFromInt(int(BaseMod.Uid)))
+		BaseMod.AddCode = fmt.Sprintf("MMM-%s-%s", BaseMod.CountryCode, GoUtil.UniqueStringFromInt(int(BaseMod.Uid)))
 		player.BackUserInfo()
 	case "debug":
 		player.HandleInUserRank()
diff --git a/src/server/game/player_base_mod.go b/src/server/game/player_base_mod.go
index 8313b354..55c6bcdf 100644
--- a/src/server/game/player_base_mod.go
+++ b/src/server/game/player_base_mod.go
@@ -115,6 +115,7 @@ func (p *PlayerBaseData) LoadDataFromDB(userName interface{}) bool {
 	p.Data.NoAd = sqlStruck.NoAd
 	p.Data.FaceBookId = sqlStruck.FaceBookId
 	p.p.PlayMod.getBaseMod().RegisterTime = int64(sqlStruck.Rolecreatetime)
+	p.p.PlayMod.getBaseMod().Uid = int64(sqlStruck.DwUin)
 	return true
 }