diff --git a/dashboard-ui/scripts/useredit.js b/dashboard-ui/scripts/useredit.js
index b982a68547..047453da81 100644
--- a/dashboard-ui/scripts/useredit.js
+++ b/dashboard-ui/scripts/useredit.js
@@ -26,6 +26,12 @@
             $('#fldConnectInfo', page).hide();
         }
 
+        if (user.ConnectLinkType == 'Guest') {
+            $('#txtUserName', page).prop("disabled", "disabled");
+        } else {
+            $('#txtUserName', page).prop("disabled", "").removeAttr('disabled');
+        }
+
         if (!loggedInUser.Configuration.IsAdministrator || !user.Id) {
 
             $('.lnkEditUserPreferencesContainer', page).hide();
@@ -254,8 +260,6 @@
         var page = this;
 
         loadData(page);
-
-        $("form input:first", page).focus();
     });
 
 })(jQuery, window, document);
\ No newline at end of file
diff --git a/dashboard-ui/scripts/userimagepage.js b/dashboard-ui/scripts/userimagepage.js
index bf44b9b772..5368c70b0d 100644
--- a/dashboard-ui/scripts/userimagepage.js
+++ b/dashboard-ui/scripts/userimagepage.js
@@ -23,10 +23,21 @@
                 });
 
                 $('#fldImage', page).show().html('').html("<img height='200px' src='" + imageUrl + "' />");
+            }
+
+            if (user.ConnectLinkType == 'Guest') {
+
+                $('.newImageSection', page).hide();
+                $('#fldDeleteImage', page).hide();
+            }
+            else if (user.PrimaryImageTag) {
 
                 $('#fldDeleteImage', page).show();
                 $('#headerUploadNewImage', page).show();
+                $('.newImageSection', page).show();
+
             } else {
+                $('.newImageSection', page).show();
                 $('#fldImage', page).hide().html('');
                 $('#fldDeleteImage', page).hide();
                 $('#headerUploadNewImage', page).hide();
diff --git a/dashboard-ui/scripts/userpassword.js b/dashboard-ui/scripts/userpassword.js
index d903702726..406789b928 100644
--- a/dashboard-ui/scripts/userpassword.js
+++ b/dashboard-ui/scripts/userpassword.js
@@ -8,16 +8,22 @@
 
             Dashboard.setPageTitle(user.Name);
 
-            if (user.HasConfiguredPassword) {
+            if (user.ConnectLinkType == 'Guest') {
+                $('.localAccessSection', page).show().collapsible("option", "collapsed", false);
+                $('.passwordSection', page).hide();
+            }
+            else if (user.HasConfiguredPassword) {
                 $('#btnResetPassword', page).show();
                 $('#fldCurrentPassword', page).show();
                 $('.formheader', page).hide();
                 $('.localAccessSection', page).show();
+                $('.passwordSection', page).show();
             } else {
                 $('#btnResetPassword', page).hide();
                 $('#fldCurrentPassword', page).hide();
                 $('.formheader', page).show();
                 $('.localAccessSection', page).hide();
+                $('.passwordSection', page).show();
             }
 
             $('#chkEnableLocalAccessWithoutPassword', page).checked(user.Configuration.EnableLocalPassword).checkboxradio('refresh');
diff --git a/dashboard-ui/scripts/userprofilespage.js b/dashboard-ui/scripts/userprofilespage.js
index ba3c3f7ad4..07bb5bc3d4 100644
--- a/dashboard-ui/scripts/userprofilespage.js
+++ b/dashboard-ui/scripts/userprofilespage.js
@@ -61,7 +61,7 @@
 
         var html = '';
 
-        var cssClass = "card homePageSquareCard alternateHover bottomPaddedCard";
+        var cssClass = "card squareCard alternateHover bottomPaddedCard";
 
         if (user.Configuration.IsDisabled) {
             cssClass += ' grayscale';
@@ -150,7 +150,13 @@
 
     function renderUsers(page, users) {
 
-        renderUsersIntoElement($('.users', page), users);
+        renderUsersIntoElement($('.localUsers', page), users.filter(function (u) {
+            return u.ConnectLinkType != 'Guest';
+        }));
+
+        renderUsersIntoElement($('.connectUsers', page), users.filter(function (u) {
+            return u.ConnectLinkType == 'Guest';
+        }));
     }
 
     function showPendingUserMenu(elem) {
@@ -190,7 +196,7 @@
 
         var html = '';
 
-        var cssClass = "card homePageSquareCard alternateHover bottomPaddedCard";
+        var cssClass = "card squareCard alternateHover bottomPaddedCard";
 
         html += "<div data-id='" + user.Id + "' class='" + cssClass + "'>";
 
@@ -255,7 +261,7 @@
     }
 
     function cancelAuthorization(page, id) {
-        
+
         Dashboard.showLoadingMsg();
 
         // Add/Update connect info
@@ -284,7 +290,7 @@
             Dashboard.hideLoadingMsg();
         });
 
-        ApiClient.getJSON(ApiClient.getUrl('Connect/Pending')).done(function(pending) {
+        ApiClient.getJSON(ApiClient.getUrl('Connect/Pending')).done(function (pending) {
 
             renderPendingGuests(page, pending);
         });
@@ -315,7 +321,24 @@
 
     }
 
-    $(document).on('pagebeforeshow', "#userProfilesPage", function () {
+    function showInvitePopup(page) {
+
+        $('#popupInvite', page).popup('open');
+
+        $('#txtConnectUsername', page).val('');
+
+    }
+
+    $(document).on('pageinit', "#userProfilesPage", function () {
+
+        var page = this;
+
+        $('.btnInvite', page).on('click', function () {
+
+            showInvitePopup(page);
+        });
+
+    }).on('pagebeforeshow', "#userProfilesPage", function () {
 
         var page = this;
 
diff --git a/dashboard-ui/userimage.html b/dashboard-ui/userimage.html
index 351be6c3cd..9f628e8334 100644
--- a/dashboard-ui/userimage.html
+++ b/dashboard-ui/userimage.html
@@ -23,25 +23,27 @@
                     </p>
                 </div>
 
-                <h2 id="headerUploadNewImage" style="display: none;">${HeaderUploadNewImage}</h2>
-                <form id="uploadUserImageForm">
-                    <ul data-role="listview" class="ulForm">
-                        <li id="fldNewImage">
-                            <p>${ImageUploadAspectRatioHelp}</p>
-                            <input type="file" accept="image/*" id="uploadUserImage" name="uploadUserImage" onchange="UserImagePage.onFileUploadChange(this);" />
+                <div class="newImageSection" style="display:none;">
+                    <h2 id="headerUploadNewImage" style="display: none;">${HeaderUploadNewImage}</h2>
+                    <form id="uploadUserImageForm">
+                        <ul data-role="listview" class="ulForm">
+                            <li id="fldNewImage">
+                                <p>${ImageUploadAspectRatioHelp}</p>
+                                <input type="file" accept="image/*" id="uploadUserImage" name="uploadUserImage" onchange="UserImagePage.onFileUploadChange(this);" />
 
-                            <div id="userImageDropZone" class="imageDropZone">
-                                <h3>${LabelDropImageHere}</h3>
-                                <output id="userImageOutput"></output>
-                            </div>
+                                <div id="userImageDropZone" class="imageDropZone">
+                                    <h3>${LabelDropImageHere}</h3>
+                                    <output id="userImageOutput"></output>
+                                </div>
 
-                        </li>
-                        <li id="fldNewImagePreview"></li>
-                        <li id="fldUpload" style="display: none;">
-                            <button type="submit" data-icon="picture">${ButtonUpload}</button>
-                        </li>
-                    </ul>
-                </form>
+                            </li>
+                            <li id="fldNewImagePreview"></li>
+                            <li id="fldUpload" style="display: none;">
+                                <button type="submit" data-icon="picture">${ButtonUpload}</button>
+                            </li>
+                        </ul>
+                    </form>
+                </div>
 
             </div>
         </div>
diff --git a/dashboard-ui/userpassword.html b/dashboard-ui/userpassword.html
index 9cd832134f..d01714ec4d 100644
--- a/dashboard-ui/userpassword.html
+++ b/dashboard-ui/userpassword.html
@@ -16,7 +16,7 @@
                 </div>
 
                 <div class="readOnlyContent">
-                    <div data-role="collapsible" data-collapsed="false">
+                    <div data-role="collapsible" data-collapsed="false" class="passwordSection" style="display:none;">
                         <h2>${HeaderPassword}</h2>
                         <div>
                             <br />
diff --git a/dashboard-ui/userprofiles.html b/dashboard-ui/userprofiles.html
index 8086d8ad27..1ee3198970 100644
--- a/dashboard-ui/userprofiles.html
+++ b/dashboard-ui/userprofiles.html
@@ -9,35 +9,40 @@
         <div data-role="content">
             <div class="content-primary">
 
-                <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
+                <div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true" style="margin-bottom:30px!important;">
                     <a href="#" data-role="button" class="ui-btn-active">${TabUsers}</a>
                 </div>
 
-                <div class="readOnlyContent">
-                    <div>
-                        <a data-role="button" data-icon="plus" href="#popupInvite" data-rel="popup" data-position-to="window" data-inline="true" data-mini="true">
+                <div class="ui-bar-a" style="padding: 0 1em;">
+                    <h3 style="margin:.6em 0;font-size:16px;font-weight:500;">
+                        <span style="vertical-align:middle;">${HeaderUsers}</span>
+                        <a data-role="button" data-icon="plus" href="useredit.html" data-inline="true" data-mini="true" data-iconpos="notext" style="margin: 0 .5em; vertical-align:middle;">
+                            ${ButtonAddUser}
+                        </a>
+                    </h3>
+                </div>
+                <div class="itemsContainer localUsers" style="text-align:left;margin-top:.5em;"></div>
+                <br /><br />
+
+                <div class="ui-bar-a" style="padding: 0 1em;">
+                    <h3 style="margin:.6em 0;font-size:16px;font-weight:500;">
+                        <span style="vertical-align:middle;">${HeaderGuests}</span>
+                        <a class="btnInvite" data-role="button" data-icon="plus" href="#" data-rel="popup" data-position-to="window" data-inline="true" data-mini="true" data-iconpos="notext" style="margin: 0 0 0 .5em; vertical-align:middle;">
                             ${ButtonInviteUser}
                         </a>
-                        <a data-role="button" data-icon="plus" href="useredit.html" data-inline="true" data-mini="true">
-                            ${ButtonAddLocalUser}
-                        </a>
-                    </div>
+                    </h3>
                 </div>
+                <div class="itemsContainer connectUsers" style="text-align:left;margin-top:.5em;"></div>
+                <br /><br />
 
-                <div class="itemsContainer users" style="text-align:left;">
-
-                </div>
-                <br />
                 <div class="sectionPendingGuests" style="display:none;">
-                    <br />
-                    <br />
-                    <div class="ui-bar-a" style="padding: 0 1em;"><h3>Pending Invitations</h3></div>
-                    <div class="itemsContainer pending" style="text-align:left;"></div>
+                    <div class="ui-bar-a" style="padding: 0 1em;"><h3 style="font-size:16px;font-weight:500;">${HeaderPendingInvitations}</h3></div>
+                    <div class="itemsContainer pending" style="text-align:left;margin-top:.5em;"></div>
                 </div>
             </div>
 
             <div data-role="popup" id="popupInvite" data-theme="a">
-                
+
                 <a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-btn-a ui-icon-delete ui-btn-icon-notext ui-btn-right">${ButtonClose}</a>
 
                 <div class="ui-bar-a" style="text-align: center; padding: 5px 20px;">
@@ -46,13 +51,13 @@
 
                 <div style="padding:10px 20px;">
 
-                    <p>${HeaderInviteUserHelp}</p>
+                    <p style="margin:1em 0 1.25em;">${HeaderInviteUserHelp}</p>
                     <form class="addUserForm">
                         <div>
                             <label for="txtConnectUsername">${LabelConnectUserName}</label>
                             <input type="text" id="txtConnectUsername" value="" placeholder="Username" required="required">
                             <div class="fieldDescription">
-                                <div>${LabelConnectInviteHelp}</div>
+                                <div>${LabelConnectInviteUserHelp}</div>
                                 <div style="margin-top: .75em;"><a href="http://mediabrowser.tv/connect" target="_blank">${ButtonLearnMoreAboutMediaBrowserConnect}</a></div>
                             </div>