diff --git a/src/managed/OpenLiveWriter.Localization/StringId.cs b/src/managed/OpenLiveWriter.Localization/StringId.cs
index 6050fbad..72c8394b 100644
--- a/src/managed/OpenLiveWriter.Localization/StringId.cs
+++ b/src/managed/OpenLiveWriter.Localization/StringId.cs
@@ -1051,11 +1051,11 @@ namespace OpenLiveWriter.Localization
         /// </summary>
         CWGoogleBloggerTitle,
         /// <summary>
-        /// If you use Hotmail, Messenger, or Xbox LIVE, you have a Microsoft Account ID.
+        /// If you use Hotmail, Messenger, or Xbox LIVE, you have a Microsoft Account.
         /// </summary>
         CWLiveIDCreateAccount,
         /// <summary>
-        /// Don't have a Microsoft Account ID?
+        /// Don't have a Microsoft Account?
         /// </summary>
         CWLiveIDCreateAccount2,
         /// <summary>
@@ -1119,7 +1119,7 @@ namespace OpenLiveWriter.Localization
         /// </summary>
         CWSharePointUseSystemLogin,
         /// <summary>
-        /// &Microsoft Account ID:
+        /// &Microsoft Account:
         /// </summary>
         CWSpacesUsername,
         /// <summary>
@@ -1871,10 +1871,6 @@ namespace OpenLiveWriter.Localization
         /// </summary>
         EmoticonMartiniGlass,
         /// <summary>
-        /// Messenger
-        /// </summary>
-        EmoticonMessenger,
-        /// <summary>
         /// Mobile phone
         /// </summary>
         EmoticonMobilePhone,
@@ -2099,10 +2095,6 @@ namespace OpenLiveWriter.Localization
         /// </summary>
         EmoticonWork,
         /// <summary>
-        /// Xbox
-        /// </summary>
-        EmoticonXbox,
-        /// <summary>
         /// Enabled
         /// </summary>
         Enabled,
@@ -3320,11 +3312,11 @@ namespace OpenLiveWriter.Localization
         /// </summary>
         Paragraphs,
         /// <summary>
-        /// Please enter a Microsoft Account ID and password to continue.
+        /// Please enter a Microsoft Account and password to continue.
         /// </summary>
         PassportLoginNoUserPass,
         /// <summary>
-        /// Microsoft Account ID and Password Required
+        /// Microsoft Account and Password Required
         /// </summary>
         PassportLoginNoUserPassTitle,
         /// <summary>
diff --git a/src/managed/OpenLiveWriter.Localization/Strings.csv b/src/managed/OpenLiveWriter.Localization/Strings.csv
index 0dae7840..65c4bb78 100644
--- a/src/managed/OpenLiveWriter.Localization/Strings.csv
+++ b/src/managed/OpenLiveWriter.Localization/Strings.csv
@@ -270,7 +270,6 @@ EmoticonDogFace,Dog face,Alternate text for the emoticon. The emoticon is from M
 EmoticonLightBulb,Light bulb,Alternate text for the emoticon. The emoticon is from Messenger so use Messenger's localization to avoid duplicate work.
 EmoticonSleepingHalfMoon,Sleeping half-moon,Alternate text for the emoticon. The emoticon is from Messenger so use Messenger's localization to avoid duplicate work.
 EmoticonEmail,Email,Alternate text for the emoticon. The emoticon is from Messenger so use Messenger's localization to avoid duplicate work.
-EmoticonMessenger,Messenger,Alternate text for the emoticon. The emoticon is from Messenger so use Messenger's localization to avoid duplicate work.
 EmoticonBlackSheep,Black Sheep,Alternate text for the emoticon. The emoticon is from Messenger so use Messenger's localization to avoid duplicate work.
 EmoticonBowl,Bowl,Alternate text for the emoticon. The emoticon is from Messenger so use Messenger's localization to avoid duplicate work.
 EmoticonSoccerBall,Soccer ball,Alternate text for the emoticon. The emoticon is from Messenger so use Messenger's localization to avoid duplicate work.
@@ -291,7 +290,6 @@ EmoticonBunny,Bunny,Alternate text for the emoticon. The emoticon is from Messen
 EmoticonSchoolBus,School bus,Alternate text for the emoticon. The emoticon is from Messenger so use Messenger's localization to avoid duplicate work.
 EmoticonPeace,Peace,Alternate text for the emoticon. The emoticon is from Messenger so use Messenger's localization to avoid duplicate work.
 EmoticonSchool,School,Alternate text for the emoticon. The emoticon is from Messenger so use Messenger's localization to avoid duplicate work.
-EmoticonXbox,Xbox,Alternate text for the emoticon. The emoticon is from Messenger so use Messenger's localization to avoid duplicate work.
 PublishDatePrompt,Set post date,No apostrophes (') allowed in this message
 PublishDateTooltip,Post date,
 PropertiesPanel,Post Properties,This is an accessibility name and should be localized.
@@ -358,11 +356,11 @@ CWSelectBlogText,More than one blog was detected. Please select the blog that yo
 CWSelectImageEndpointText,Please select the collection that you'd like images to be uploaded to:,
 PasswordChar,0x25CF,The hex value of the single character that will be used to represent each character in a password field.
 ViewWeblog,View Blog,
-CWSpacesUsername,&Microsoft Account ID:,
-CWLiveIDCreateAccount,"If you use Hotmail, Messenger, or Xbox LIVE, you have a Microsoft Account ID.",
+CWSpacesUsername,&Microsoft Account:,
+CWLiveIDCreateAccount,"If you use Hotmail, Messenger, or Xbox LIVE, you have a Microsoft Account.",
 RememberPassword,&Remember my password,
-CWSpacesUsernameExample,(example555@hotmail.com),Example of Microsoft Account ID
-CWLiveIDCreateAccount2,Don't have a Microsoft Account ID?,
+CWSpacesUsernameExample,(example555@hotmail.com),Example of Microsoft Account
+CWLiveIDCreateAccount2,Don't have a Microsoft Account?,
 CWSharePointText,To use {0} you must have a SharePoint blog.,{0} - Open Live Writer
 CWSharePointHomepageUrl,Share&Point blog web address:,
 CWSharePointTitle,Configure {0} for a SharePoint blog,{0} - Writer
@@ -906,8 +904,8 @@ UnhandledExceptionErrorMessage,An unexpected error has occurred within the appli
 UnhandledExceptionErrorTitle,Unexpected Error Occurred,
 PassportLoginSignIn,Sign in,
 PassportLoginTitle,Sign in to Microsoft Account,
-PassportLoginNoUserPass,Please enter a Microsoft Account ID and password to continue.,
-PassportLoginNoUserPassTitle,Microsoft Account ID and Password Required,
+PassportLoginNoUserPass,Please enter a Microsoft Account and password to continue.,
+PassportLoginNoUserPassTitle,Microsoft Account and Password Required,
 MinimizeButtonTooltip,Minimize,
 MaximizeButtonTooltip,Maximize,
 CloseButtonTooltip,Close,In the sense of closing a window.
diff --git a/src/managed/OpenLiveWriter.Localization/Strings.resx b/src/managed/OpenLiveWriter.Localization/Strings.resx
index 2dbc972b..6e7ed74a 100644
--- a/src/managed/OpenLiveWriter.Localization/Strings.resx
+++ b/src/managed/OpenLiveWriter.Localization/Strings.resx
@@ -1027,10 +1027,10 @@
     <value>Provide Google Blogger Login</value>
   </data>
   <data name="CWLiveIDCreateAccount" xml:space="preserve">
-    <value>If you use Hotmail, Messenger, or Xbox LIVE, you have a Microsoft Account ID.</value>
+    <value>If you use Hotmail, Messenger, or Xbox LIVE, you have a Microsoft Account.</value>
   </data>
   <data name="CWLiveIDCreateAccount2" xml:space="preserve">
-    <value>Don't have a Microsoft Account ID?</value>
+    <value>Don't have a Microsoft Account?</value>
   </data>
   <data name="CWProgressHeader" xml:space="preserve">
     <value>Setting up your blog account</value>
@@ -1081,11 +1081,11 @@
     <value>Use my &amp;Windows user name and password</value>
   </data>
   <data name="CWSpacesUsername" xml:space="preserve">
-    <value>&amp;Microsoft Account ID:</value>
+    <value>&amp;Microsoft Account:</value>
   </data>
   <data name="CWSpacesUsernameExample" xml:space="preserve">
     <value>(example555@hotmail.com)</value>
-    <comment>Example of Microsoft Account ID</comment>
+    <comment>Example of Microsoft Account</comment>
   </data>
   <data name="CWStaticSiteCommandsBuildCommand" xml:space="preserve">
     <value>Build command:</value>
@@ -1727,10 +1727,6 @@
     <value>Martini glass</value>
     <comment>Alternate text for the emoticon. The emoticon is from Messenger so use Messenger's localization to avoid duplicate work.</comment>
   </data>
-  <data name="EmoticonMessenger" xml:space="preserve">
-    <value>Messenger</value>
-    <comment>Alternate text for the emoticon. The emoticon is from Messenger so use Messenger's localization to avoid duplicate work.</comment>
-  </data>
   <data name="EmoticonMobilePhone" xml:space="preserve">
     <value>Mobile phone</value>
     <comment>Alternate text for the emoticon. The emoticon is from Messenger so use Messenger's localization to avoid duplicate work.</comment>
@@ -1955,10 +1951,6 @@
     <value>Work</value>
     <comment>Alternate text for the emoticon. The emoticon is from Messenger so use Messenger's localization to avoid duplicate work.</comment>
   </data>
-  <data name="EmoticonXbox" xml:space="preserve">
-    <value>Xbox</value>
-    <comment>Alternate text for the emoticon. The emoticon is from Messenger so use Messenger's localization to avoid duplicate work.</comment>
-  </data>
   <data name="Enabled" xml:space="preserve">
     <value>Enabled</value>
   </data>
@@ -2924,10 +2916,10 @@ Unimplemented Method: {2}</value>
     <value>Paragraphs</value>
   </data>
   <data name="PassportLoginNoUserPass" xml:space="preserve">
-    <value>Please enter a Microsoft Account ID and password to continue.</value>
+    <value>Please enter a Microsoft Account and password to continue.</value>
   </data>
   <data name="PassportLoginNoUserPassTitle" xml:space="preserve">
-    <value>Microsoft Account ID and Password Required</value>
+    <value>Microsoft Account and Password Required</value>
   </data>
   <data name="PassportLoginSignIn" xml:space="preserve">
     <value>Sign in</value>