diff --git a/src/MusicStore/Views/Account/ExternalLoginConfirmation.cshtml b/src/MusicStore/Views/Account/ExternalLoginConfirmation.cshtml
deleted file mode 100644
index ebdf0b0159..0000000000
--- a/src/MusicStore/Views/Account/ExternalLoginConfirmation.cshtml
+++ /dev/null
@@ -1,39 +0,0 @@
-@model MusicStore.Models.ExternalLoginConfirmationViewModel
-@{
-    ViewBag.Title = "Register";
-}
-<h2>@ViewBag.Title.</h2>
-<h3>Associate your @ViewBag.LoginProvider account.</h3>
-
-@using (Html.BeginForm("ExternalLoginConfirmation", "Account", new { ReturnUrl = ViewBag.ReturnUrl }, FormMethod.Post, new { @class = "form-horizontal", role = "form" }))
-{
-    @Html.AntiForgeryToken()
-
-    <h4>Association Form</h4>
-    <hr />
-    @Html.ValidationSummary(true)
-    <p class="text-info">
-        You've successfully authenticated with <strong>@ViewBag.LoginProvider</strong>.
-        Please enter a user name for this site below and click the Register button to finish
-        logging in.
-    </p>
-    <div class="form-group">
-        @Html.LabelFor(m => m.UserName, new { @class = "col-md-2 control-label" })
-        <div class="col-md-10">
-            @Html.TextBoxFor(m => m.UserName, new { @class = "form-control" })
-            @Html.ValidationMessageFor(m => m.UserName)
-        </div>
-    </div>
-    <div class="form-group">
-        <div class="col-md-offset-2 col-md-10">
-            <input type="submit" class="btn btn-default" value="Register" />
-        </div>
-    </div>
-}
-
-@section Scripts {
-    @*Bug : Script helpers are out of scope for alpha*@
-    @*@Scripts.Render("~/bundles/jqueryval")*@
-    <script src="@Url.Content("~/Scripts/jquery.validate.js")"></script>
-    <script src="@Url.Content("~/Scripts/jquery.validate.unobtrusive.js")"></script>
-}
diff --git a/src/MusicStore/Views/Account/ExternalLoginFailure.cshtml b/src/MusicStore/Views/Account/ExternalLoginFailure.cshtml
deleted file mode 100644
index c3d56e01d5..0000000000
--- a/src/MusicStore/Views/Account/ExternalLoginFailure.cshtml
+++ /dev/null
@@ -1,8 +0,0 @@
-@{
-    //Bug: Need a way to specify the layout page in a single place
-    Layout = "/Views/Shared/_Layout.cshtml";
-    ViewBag.Title = "Login Failure";
-}
-
-<h2>@ViewBag.Title.</h2>
-<h3 class="text-error">Unsuccessful login with service.</h3>
diff --git a/src/MusicStore/Views/Account/Manage.cshtml b/src/MusicStore/Views/Account/Manage.cshtml
index 4e576dcc66..f2a491ccbd 100644
--- a/src/MusicStore/Views/Account/Manage.cshtml
+++ b/src/MusicStore/Views/Account/Manage.cshtml
@@ -1,6 +1,4 @@
-@using MusicStore.Models;
-@using Microsoft.AspNet.Identity;
-@{
+@{
     //Bug: Need a way to specify the layout page in a single place
     Layout = "/Views/Shared/_Layout.cshtml";
     ViewBag.Title = "Manage Account";
@@ -11,14 +9,7 @@
 
 <div class="row">
     <div class="col-md-12">
-        @if (ViewBag.HasLocalPassword)
-        {
-            await Html.PartialAsync("_ChangePasswordPartial");
-        }
-        else
-        {
-            await Html.PartialAsync("_SetPasswordPartial");
-        }
+        @await Html.PartialAsync("_ChangePasswordPartial")
     </div>
 </div>
 
diff --git a/src/MusicStore/Views/Account/Register.cshtml b/src/MusicStore/Views/Account/Register.cshtml
index 244f2b6cb7..03ef461d0c 100644
--- a/src/MusicStore/Views/Account/Register.cshtml
+++ b/src/MusicStore/Views/Account/Register.cshtml
@@ -31,7 +31,7 @@
         @*@Html.LabelFor(m => m.ConfirmPassword, new { @class = "col-md-2 control-label" })*@
         <label class="col-md-2 control-label">Confirm Password</label>
         <div class="col-md-10">
-            @*@Html.PasswordFor(m => m.ConfirmPassword, new { @class = "form-control" })*@
+            @Html.PasswordFor(m => m.ConfirmPassword, new { @class = "form-control" })
         </div>
     </div>
     <div class="form-group">
diff --git a/src/MusicStore/Views/Account/_ChangePasswordPartial.cshtml b/src/MusicStore/Views/Account/_ChangePasswordPartial.cshtml
index c48462a6ef..2780702609 100644
--- a/src/MusicStore/Views/Account/_ChangePasswordPartial.cshtml
+++ b/src/MusicStore/Views/Account/_ChangePasswordPartial.cshtml
@@ -1,14 +1,15 @@
-@using Microsoft.AspNet.Identity
+@*This using statement to MusicStore.Controllers should go away once we have the GetUserName() extension on IIdentity in some Identity package*@
+@using MusicStore.Controllers
 @model MusicStore.Models.ManageUserViewModel
 
-<p>You're logged in as <strong>@Context.HttpContext.User.Identity.Name</strong>.</p>
+<p>You're logged in as <strong>@Context.HttpContext.User.Identity.GetUserName()</strong>.</p>
 
 @using (Html.BeginForm("Manage", "Account", FormMethod.Post, new { @class = "form-horizontal", role = "form" }))
 {
     @*@Html.AntiForgeryToken()*@
     <h4>Change Password Form</h4>
     <hr />
-    @Html.ValidationSummary()
+    @*@Html.ValidationSummary()*@
     <div class="form-group">
         @*@Html.LabelFor(m => m.OldPassword, new { @class = "col-md-2 control-label" })*@
         <label class="col-md-2 control-label">Old Password</label>
diff --git a/src/MusicStore/Views/Account/_ExternalLoginsListPartial.cshtml b/src/MusicStore/Views/Account/_ExternalLoginsListPartial.cshtml
deleted file mode 100644
index 8f40061e06..0000000000
--- a/src/MusicStore/Views/Account/_ExternalLoginsListPartial.cshtml
+++ /dev/null
@@ -1,33 +0,0 @@
-@using Microsoft.AspNet.Identity;
-
-<h4>Use another service to log in.</h4>
-<hr />
-@{
-    var loginProviders = Context.HttpContext.GetAuthenticationTypes();
-    if (loginProviders.Count() == 0)
-    {
-        <div>
-            <p>
-                There are no external authentication services configured. See <a href="http://go.microsoft.com/fwlink/?LinkId=313242">this article</a>
-                for details on setting up this ASP.NET application to support logging in via external services.
-            </p>
-        </div>
-    }
-    else
-    {
-        string action = Model.Action;
-        string returnUrl = Model.ReturnUrl;
-        using (Html.BeginForm(action, "Account", new { ReturnUrl = returnUrl }))
-        {
-            @Html.AntiForgeryToken()
-            <div id="socialLoginList">
-                <p>
-                    @foreach (AuthenticationDescription p in loginProviders)
-                    {
-                        <button type="submit" class="btn btn-default" id="@p.AuthenticationType" name="provider" value="@p.AuthenticationType" title="Log in using your @p.Caption account">@p.AuthenticationType</button>
-                    }
-                </p>
-            </div>
-        }
-    }
-}
diff --git a/src/MusicStore/Views/Account/_RemoveAccountPartial.cshtml b/src/MusicStore/Views/Account/_RemoveAccountPartial.cshtml
deleted file mode 100644
index 5b10a07d92..0000000000
--- a/src/MusicStore/Views/Account/_RemoveAccountPartial.cshtml
+++ /dev/null
@@ -1,34 +0,0 @@
-@model ICollection<microsoft.aspnet.identity.userlogininfo>
-
-    @if (Model.Count > 0)
-    {
-        <h4>Registered Logins</h4>
-        <table class="table">
-            <tbody>
-                @foreach (var account in Model)
-                {
-                    <tr>
-                        <td>@account.LoginProvider</td>
-                        <td>
-                            @if (ViewBag.ShowRemoveButton)
-                            {
-                                using (Html.BeginForm("Disassociate", "Account"))
-                                {
-                                    @Html.AntiForgeryToken()
-                                    <div>
-                                        @Html.Hidden("loginProvider", account.LoginProvider)
-                                        @Html.Hidden("providerKey", account.ProviderKey)
-                                        <input type="submit" class="btn btn-default" value="Remove" title="Remove this @account.LoginProvider login from your account" />
-                                    </div>
-                                }
-                            }
-                            else
-                            {
-                                @: &nbsp;
-                        }
-                        </td>
-                    </tr>
-                }
-            </tbody>
-        </table>
-    }
\ No newline at end of file