diff --git a/airtime_mvc/application/layouts/scripts/layout.phtml b/airtime_mvc/application/layouts/scripts/layout.phtml
index bb7202076..60732638d 100644
--- a/airtime_mvc/application/layouts/scripts/layout.phtml
+++ b/airtime_mvc/application/layouts/scripts/layout.phtml
@@ -24,7 +24,7 @@
     <div class="personal-block solo">
         <ul>
           <li>
-            <a id="current-user" href="#"><span class="name"><?php echo $this->loggedInAs()?></span></a> | <a href=<?php echo $baseUrl . "/Login/logout"?>><?php echo _("Logout")?></a>
+            <a id="current-user" href=<?php echo $baseUrl . "/User/edit-user"?>><span class="name"><?php echo $this->loggedInAs()?></span></a> | <a href=<?php echo $baseUrl . "/Login/logout"?>><?php echo _("Logout")?></a>
           </li>
         </ul>
     </div>
diff --git a/airtime_mvc/application/views/scripts/user/edit-user.phtml b/airtime_mvc/application/views/scripts/user/edit-user.phtml
index a5a355db9..34f811f1b 100644
--- a/airtime_mvc/application/views/scripts/user/edit-user.phtml
+++ b/airtime_mvc/application/views/scripts/user/edit-user.phtml
@@ -1,3 +1,5 @@
-
+<div class="ui-widget ui-widget-content block-shadow clearfix padded-strong edit-current-user">
+<h2><? echo _("Edit User") ?></h2>
 <?php echo $this->successMessage ?>
 <?php echo $this->form?>
+</div>
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 5aa57eaaf..60837fa0c 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -97,6 +97,14 @@ select {
     padding-bottom: 20px;
 }
 
+.edit-current-user {
+    width: 450px;
+}
+
+.edit-current-user label {
+    font-weight: bold;
+}
+
 .override_help_icon, .icecast_metadata_help_icon {
         cursor: help;
         position: relative;
@@ -2956,19 +2964,19 @@ dd .stream-status {
 }
 
 .edit-user-global dt {
-    width: 100px;
+    width: 150px;
     float: left;
     margin-top: 4px;
     margin-left: 2px;
 }
 
 .edit-user-global dd {
-    width: 240px;
+    width: 340px;
     padding-bottom: 5px;
 }
 
-.edit-user-global input {
-    width: 170px;
+.edit-user-global input, select {
+    width: 200px;
 }
 
 
diff --git a/airtime_mvc/public/js/airtime/dashboard/dashboard.js b/airtime_mvc/public/js/airtime/dashboard/dashboard.js
index 764751fb4..802dfceed 100644
--- a/airtime_mvc/public/js/airtime/dashboard/dashboard.js
+++ b/airtime_mvc/public/js/airtime/dashboard/dashboard.js
@@ -453,52 +453,22 @@ function setCurrentUserPseudoPassword() {
 $(document).ready(function() {
     if ($('#master-panel').length > 0)
         init();
-
-    var timer;
-
-    $('.tipsy').live('mouseover', function() {
-        clearTimeout(timer);
-    });
-
-    $('.tipsy').live('blur', function() {
-        timer = setTimeout("$('#current-user').tipsy('hide')", 500);
-    });
-
-    $('#current-user').bind('mouseover', function() {
+    setCurrentUserPseudoPassword();
+    
+    $('#current-user').live('click', function() {
         $.ajax({
-            url: baseUrl+'/user/edit-user/format/json',
-            success: function(json) {
-                $('#current-user').tipsy({
-                    gravity: 'n',
-                    html: true,
-                    fade: true,
-                    opacity: 0.9,
-                    trigger: 'manual',
-                    title: function() {
-                        return json.html;
-                    }
-                });
-            },
-            cache: false,
-            complete: function() {
-                $('#current-user').tipsy('show');
-                setCurrentUserPseudoPassword();
-            }
+            url: baseUrl+'/user/edit-user/format/json'
         });
-        
     });
-
-    $('#current-user').bind('mouseout', function() {
-        timer = setTimeout("$('#current-user').tipsy('hide')", 500);
-    });
-
+    
     $('#cu_save_user').live('click', function() {
         var data = $('#current-user-form').serialize();
         $.post(baseUrl+'/user/edit-user', {format: 'json', data: data}, function(data) {
             var json = $.parseJSON(data);
-            $('.tipsy-inner').empty().append(json.html);
+            $('.edit-current-user').parent().empty().append(json.html);
             setCurrentUserPseudoPassword();
             setTimeout(removeSuccessMsg, 5000);
         });
     });
+
 });