diff --git a/src/Orchard.Web/Modules/Orchard.Email/Drivers/SmtpSettingsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Email/Drivers/SmtpSettingsPartDriver.cs
index 7706e6d2b..64c59f9a7 100644
--- a/src/Orchard.Web/Modules/Orchard.Email/Drivers/SmtpSettingsPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Email/Drivers/SmtpSettingsPartDriver.cs
@@ -25,7 +25,14 @@ namespace Orchard.Email.Drivers {
         }
 
         protected override DriverResult Editor(SmtpSettingsPart part, IUpdateModel updater, dynamic shapeHelper) {
+            var previousPassword = part.Password;
             updater.TryUpdateModel(part, Prefix, null, null);
+
+            // restore password if the input is empty, meaning it has not been reseted
+            if (string.IsNullOrEmpty(part.Password)) { 
+                part.Password = previousPassword;
+            }
+            
             return ContentShape("Parts_SmtpSettings_Edit",
                     () => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: part, Prefix: Prefix));
         }
diff --git a/src/Orchard.Web/Modules/Orchard.Messaging/Drivers/MessageSettingsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Messaging/Drivers/MessageSettingsPartDriver.cs
index 38bb56db7..cbc319c69 100644
--- a/src/Orchard.Web/Modules/Orchard.Messaging/Drivers/MessageSettingsPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Messaging/Drivers/MessageSettingsPartDriver.cs
@@ -35,6 +35,7 @@ namespace Orchard.Messaging.Drivers {
 
         protected override DriverResult Editor(MessageSettingsPart part, IUpdateModel updater, dynamic shapeHelper) {
             var model = new MessageSettingsPartViewModel {
+                ChannelServices = _messageQueueManager.GetAvailableChannelServices(),
                 MessageSettings = part
             };
 
diff --git a/src/Orchard.Web/Modules/Orchard.Messaging/Orchard.Messaging.csproj b/src/Orchard.Web/Modules/Orchard.Messaging/Orchard.Messaging.csproj
index 68b482b95..bcae4f963 100644
--- a/src/Orchard.Web/Modules/Orchard.Messaging/Orchard.Messaging.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Messaging/Orchard.Messaging.csproj
@@ -3,7 +3,8 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion></ProductVersion>
+    <ProductVersion>
+    </ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{085948FF-0E9B-4A9A-B564-F8B8B4BDDDBC}</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
diff --git a/src/Orchard.Web/Modules/Orchard.Messaging/Views/EditorTemplates/Parts/MessageSettings.cshtml b/src/Orchard.Web/Modules/Orchard.Messaging/Views/EditorTemplates/Parts/MessageSettings.cshtml
index 0bde72b23..e645797a6 100644
--- a/src/Orchard.Web/Modules/Orchard.Messaging/Views/EditorTemplates/Parts/MessageSettings.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Messaging/Views/EditorTemplates/Parts/MessageSettings.cshtml
@@ -1,6 +1,6 @@
 @model MessageSettingsPartViewModel
-@using Orchard.Core.Messaging.Models;
-@using Orchard.Core.Messaging.ViewModels;
+@using Orchard.Messaging.Models;
+@using Orchard.Messaging.ViewModels;
 <fieldset>
     <legend>@T("Messaging")</legend>
     <div>