diff --git a/src/Orchard.Tests.Modules/Settings/Blueprint/ShellDescriptorManagerTests.cs b/src/Orchard.Tests.Modules/Settings/Blueprint/ShellDescriptorManagerTests.cs
index be1d6f822..4553ce88a 100644
--- a/src/Orchard.Tests.Modules/Settings/Blueprint/ShellDescriptorManagerTests.cs
+++ b/src/Orchard.Tests.Modules/Settings/Blueprint/ShellDescriptorManagerTests.cs
@@ -26,10 +26,7 @@ namespace Orchard.Tests.Modules.Settings.Blueprint {
             public string LastMessageName { get; set; }
             public IDictionary<string, object> LastEventData { get; set; }
 
-            public void Notify_Obsolete(string messageName, IDictionary<string, string> eventData) {
-            }
-
-            public IEnumerable Notify(string messageName, Dictionary<string, object> eventData) {                
+            public IEnumerable Notify(string messageName, IDictionary<string, object> eventData) {                
                 LastMessageName = messageName;
                 LastEventData = eventData;
                 return new object[0];
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Models/UserRecord.cs b/src/Orchard.Web/Modules/Orchard.Users/Models/UserRecord.cs
index dbb9a6039..3d3c7ec46 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Models/UserRecord.cs
+++ b/src/Orchard.Web/Modules/Orchard.Users/Models/UserRecord.cs
@@ -9,6 +9,7 @@ namespace Orchard.Users.Models {
 
         public virtual string Password { get; set; }
         public virtual MembershipPasswordFormat PasswordFormat { get; set; }
+        public virtual string HashAlgorithm { get; set; }
         public virtual string PasswordSalt { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs b/src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs
index 86f3dab9d..18905881c 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Users/Services/MembershipService.cs
@@ -39,6 +39,7 @@ namespace Orchard.Users.Services {
                 init.Record.UserName = createUserParams.Username;
                 init.Record.Email = createUserParams.Email;
                 init.Record.NormalizedUserName = createUserParams.Username.ToLower();
+                init.Record.HashAlgorithm = "SHA1";
                 SetPassword(init.Record, createUserParams.Password);
             });
         }
@@ -128,7 +129,7 @@ namespace Orchard.Users.Services {
 
             var combinedBytes = saltBytes.Concat(passwordBytes).ToArray();
 
-            var hashAlgorithm = HashAlgorithm.Create("SHA1");
+            var hashAlgorithm = HashAlgorithm.Create(record.HashAlgorithm);
             var hashBytes = hashAlgorithm.ComputeHash(combinedBytes);
 
             record.PasswordFormat = MembershipPasswordFormat.Hashed;
@@ -144,7 +145,7 @@ namespace Orchard.Users.Services {
 
             var combinedBytes = saltBytes.Concat(passwordBytes).ToArray();
 
-            var hashAlgorithm = HashAlgorithm.Create("SHA1");
+            var hashAlgorithm = HashAlgorithm.Create(record.HashAlgorithm);
             var hashBytes = hashAlgorithm.ComputeHash(combinedBytes);
 
             return record.Password == Convert.ToBase64String(hashBytes);
diff --git a/src/Orchard.Web/Themes/Contoso/Styles/site.css b/src/Orchard.Web/Themes/Contoso/Styles/site.css
index f1424626a..d92dd7aa8 100644
--- a/src/Orchard.Web/Themes/Contoso/Styles/site.css
+++ b/src/Orchard.Web/Themes/Contoso/Styles/site.css
@@ -172,9 +172,10 @@ caption     { background: #eee; }
    
 -------------------------------------------------------------- */
 
-label       { font-weight: normal; }
-fieldset    { padding:0em; margin: 0 0 0em 0; border: 0px solid #ccc; }
-legend      { font-weight: bold; font-size:1.2em; }
+label             { font-weight: normal; display:block; }
+label.forcheckbox { margin:0 0 0 4px; display:inline; }
+fieldset          { padding:0em; margin: 0 0 0em 0; border: 0px solid #ccc; }
+legend            { font-weight: bold; font-size:1.2em; }
 
 
 /* Form fields
diff --git a/src/Orchard.Web/Themes/Contoso/Views/LogOn.ascx b/src/Orchard.Web/Themes/Contoso/Views/LogOn.ascx
index 0f3387f47..7a62692f8 100644
--- a/src/Orchard.Web/Themes/Contoso/Views/LogOn.ascx
+++ b/src/Orchard.Web/Themes/Contoso/Views/LogOn.ascx
@@ -9,7 +9,7 @@ using (Html.BeginFormAntiForgeryPost(Url.Action("LogOn", new {ReturnUrl = Reques
 <fieldset class="login-form">
     <legend><%: T("Account Information")%></legend>
     <div class="group">
-        <label for="username"><%: T("Username:")%></label>
+        <label for="userNameOrEmail"><%: T("Username:")%></label>
         <%: Html.TextBox("userNameOrEmail", "", new { autofocus = "autofocus" })%>
         <%: Html.ValidationMessage("userNameOrEmail")%>
     </div>
diff --git a/src/Orchard.Web/Themes/Corporate/Styles/site.css b/src/Orchard.Web/Themes/Corporate/Styles/site.css
index cbc127a02..5d76a2214 100644
--- a/src/Orchard.Web/Themes/Corporate/Styles/site.css
+++ b/src/Orchard.Web/Themes/Corporate/Styles/site.css
@@ -170,9 +170,10 @@ caption     { background: #eee; }
    
 -------------------------------------------------------------- */
 
-label       { font-weight: normal; }
-fieldset    { padding:0em; margin: 0 0 0em 0; border: 0px solid #ccc; }
-legend      { font-weight: bold; font-size:1.2em; }
+label             { font-weight: normal; display:block; }
+label.forcheckbox { margin:0 0 0 4px; display:inline; }
+fieldset          { padding:0em; margin: 0 0 0em 0; border: 0px solid #ccc; }
+legend            { font-weight: bold; font-size:1.2em; }
 
 
 /* Form fields
diff --git a/src/Orchard.Web/Themes/Corporate/Views/LogOn.ascx b/src/Orchard.Web/Themes/Corporate/Views/LogOn.ascx
index 0f3387f47..7a62692f8 100644
--- a/src/Orchard.Web/Themes/Corporate/Views/LogOn.ascx
+++ b/src/Orchard.Web/Themes/Corporate/Views/LogOn.ascx
@@ -9,7 +9,7 @@ using (Html.BeginFormAntiForgeryPost(Url.Action("LogOn", new {ReturnUrl = Reques
 <fieldset class="login-form">
     <legend><%: T("Account Information")%></legend>
     <div class="group">
-        <label for="username"><%: T("Username:")%></label>
+        <label for="userNameOrEmail"><%: T("Username:")%></label>
         <%: Html.TextBox("userNameOrEmail", "", new { autofocus = "autofocus" })%>
         <%: Html.ValidationMessage("userNameOrEmail")%>
     </div>
diff --git a/src/Orchard/Events/DefaultOrchardEventBus.cs b/src/Orchard/Events/DefaultOrchardEventBus.cs
index f78b2d6ac..511f75c6c 100644
--- a/src/Orchard/Events/DefaultOrchardEventBus.cs
+++ b/src/Orchard/Events/DefaultOrchardEventBus.cs
@@ -20,12 +20,12 @@ namespace Orchard.Events {
         public Localizer T { get; set; }
 
 
-        public IEnumerable Notify(string messageName, Dictionary<string, object> eventData) {
+        public IEnumerable Notify(string messageName, IDictionary<string, object> eventData) {
             // call ToArray to ensure evaluation has taken place
             return NotifyHandlers(messageName, eventData).ToArray();
         }
 
-        private IEnumerable<object> NotifyHandlers(string messageName, Dictionary<string, object> eventData) {
+        private IEnumerable<object> NotifyHandlers(string messageName, IDictionary<string, object> eventData) {
             string[] parameters = messageName.Split('.');
             if (parameters.Length != 2) {
                 throw new ArgumentException(messageName + T(" is not formatted correctly"));
@@ -46,7 +46,7 @@ namespace Orchard.Events {
             }
         }
 
-        private bool TryNotifyHandler(IEventHandler eventHandler, string messageName, string interfaceName, string methodName, Dictionary<string, object> eventData, out IEnumerable returnValue) {
+        private bool TryNotifyHandler(IEventHandler eventHandler, string messageName, string interfaceName, string methodName, IDictionary<string, object> eventData, out IEnumerable returnValue) {
             try {
                 return TryInvoke(eventHandler, interfaceName, methodName, eventData, out returnValue);
             }
diff --git a/src/Orchard/Events/IEventBus.cs b/src/Orchard/Events/IEventBus.cs
index 2567f64f6..c55515810 100644
--- a/src/Orchard/Events/IEventBus.cs
+++ b/src/Orchard/Events/IEventBus.cs
@@ -3,6 +3,6 @@ using System.Collections.Generic;
 
 namespace Orchard.Events {
     public interface IEventBus : IDependency {
-        IEnumerable Notify(string messageName, Dictionary<string, object> eventData);
+        IEnumerable Notify(string messageName, IDictionary<string, object> eventData);
     }
 }