diff --git a/Libs/NickTag-1.0/NickTag-1.0.lua b/Libs/NickTag-1.0/NickTag-1.0.lua
index 0e00f1b0..90a704ed 100644
--- a/Libs/NickTag-1.0/NickTag-1.0.lua
+++ b/Libs/NickTag-1.0/NickTag-1.0.lua
@@ -585,7 +585,11 @@ end
 		--here we format the text to match titles, e.g converts name like "JASON NICKSHOW" into "Jason Nickshow". 
 		name = name:gsub ("(%a)([%w_']*)", titlecase)
 		
-		local playerName = UnitName ("player")
+		local playerName, realmName = UnitFullName ("player")
+
+		if(select(4, GetBuildInfo()) >= 100200) then
+			playerName = playerName .. '-' .. realmName
+		end
 		
 		--get the full nick table.
 		local nickTable = NickTag:GetNicknameTable (playerName)
diff --git a/frames/window_options2_sections.lua b/frames/window_options2_sections.lua
index 20e027b2..cccc4785 100644
--- a/frames/window_options2_sections.lua
+++ b/frames/window_options2_sections.lua
@@ -607,7 +607,7 @@ do
             {type = "label", get = function() return Loc ["STRING_OPTIONS_SOCIAL"] end, text_template = subSectionTitleTextTemplate},
             {--nickname
                 type = "textentry",
-                get = function() return Details:GetNickname(_G.UnitName("player"), _G.UnitName("player"), true) or "" end,
+                get = function() return Details:GetNickname(Details.playername, _G.UnitName("player"), true) or "" end,
                 func = function(self, _, text)
                     local accepted, errortext = Details:SetNickname(text)
                     if (not accepted) then