diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 1e20fc7bf8..51d39eb4e3 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -1137,12 +1137,16 @@ void LLFloaterPreference::onBtnCancel()
 }
 
 // static 
-void LLFloaterPreference::updateUserInfo(const std::string& visibility, bool im_via_email)
+// <FS:Ansariel> Show email address in preferences (FIRE-1071)
+//void LLFloaterPreference::updateUserInfo(const std::string& visibility, bool im_via_email)
+void LLFloaterPreference::updateUserInfo(const std::string& visibility, bool im_via_email, const std::string& email)
 {
 	LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences");
 	if (instance)
 	{
-		instance->setPersonalInfo(visibility, im_via_email);	
+		// <FS:Ansariel> Show email address in preferences (FIRE-1071)
+		//instance->setPersonalInfo(visibility, im_via_email);	
+		instance->setPersonalInfo(visibility, im_via_email, email);
 	}
 }
 
@@ -2056,7 +2060,10 @@ bool LLFloaterPreference::moveTranscriptsAndLog()
 	return true;
 }
 
-void LLFloaterPreference::setPersonalInfo(const std::string& visibility, bool im_via_email)
+// <FS:Ansariel> Show email address in preferences (FIRE-1071)
+//void LLFloaterPreference::setPersonalInfo(const std::string& visibility, bool im_via_email)
+void LLFloaterPreference::setPersonalInfo(const std::string& visibility, bool im_via_email, const std::string& email)
+// </FS:Ansariel> Show email address in preferences (FIRE-1071)
 {
 	mGotPersonalInfo = true;
 	mOriginalIMViaEmail = im_via_email;
@@ -2100,13 +2107,13 @@ void LLFloaterPreference::setPersonalInfo(const std::string& visibility, bool im
 		getChildView("reset_logpath")->setEnabled(TRUE);
 	}
 	// <FS:Ansariel> Show email address in preferences (FIRE-1071)
-	//getChild<LLUICtrl>("email_address")->setValue(display_email); <FS:TM> CHUI Merge LL removed this line, commenting out rest fror now
-	//if(display_email.size() > 30)
-	//{
-	//	display_email.resize(30);
-	//	display_email += "...";
-	//}
-	//getChild<LLCheckBoxCtrl>("send_im_to_email")->setLabelArg("[EMAIL]", display_email);
+	std::string display_email(email);
+	if(display_email.size() > 30)
+	{
+		display_email.resize(30);
+		display_email += "...";
+	}
+	getChild<LLCheckBoxCtrl>("send_im_to_email")->setLabelArg("[EMAIL]", display_email);
 	// </FS:Ansariel> Show email address in preferences (FIRE-1071)
 }
 
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index 8eced39999..132ac42dda 100755
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -78,7 +78,9 @@ public:
 	/*virtual*/ void changed(const LLUUID& session_id, U32 mask) {};
 
 	// static data update, called from message handler
-	static void updateUserInfo(const std::string& visibility, bool im_via_email);
+	// <FS:Ansariel> Show email address in preferences (FIRE-1071)
+	//static void updateUserInfo(const std::string& visibility, bool im_via_email);
+	static void updateUserInfo(const std::string& visibility, bool im_via_email, const std::string& email);
 
 	// refresh all the graphics preferences menus
 	static void refreshEnabledGraphics();
@@ -180,7 +182,10 @@ public:
 	//[FIX FIRE-2765 : SJ] Making sure Reset button resets works
 	void onClickResetLogPath();
 	void enableHistory();
-	void setPersonalInfo(const std::string& visibility, bool im_via_email);
+	// <FS:Ansariel> Show email address in preferences (FIRE-1071)
+	//void setPersonalInfo(const std::string& visibility, bool im_via_email);
+	void setPersonalInfo(const std::string& visibility, bool im_via_email, const std::string& email);
+	// </FS:Ansariel> Show email address in preferences (FIRE-1071)
 	void refreshEnabledState();
 	void disableUnavailableSettings();
 	void onCommitWindowedMode();
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 564ab17247..11a056afdf 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -8487,7 +8487,10 @@ void process_user_info_reply(LLMessageSystem* msg, void**)
 	std::string dir_visibility;
 	msg->getString( "UserData", "DirectoryVisibility", dir_visibility);
 
-	LLFloaterPreference::updateUserInfo(dir_visibility, im_via_email);
+	// <FS:Ansariel> Show email address in preferences (FIRE-1071)
+	//LLFloaterPreference::updateUserInfo(dir_visibility, im_via_email);
+	LLFloaterPreference::updateUserInfo(dir_visibility, im_via_email, email);
+	// </FS:Ansariel> Show email address in preferences (FIRE-1071)
 	LLFloaterSnapshot::setAgentEmail(email);
 }