diff --git a/devel.css b/devel.css
index f06179d..df65403 100644
--- a/devel.css
+++ b/devel.css
@@ -100,3 +100,33 @@ div.devel-querylog div.cell {
     top:0em;
     /*width:9em;*/
     }
+
+
+/**
+ * Switch User block
+ */
+
+div#content div#block-devel-switch-user ul.links {
+  margin-left: 0;
+  padding-left: 0;
+}
+
+div#content div#block-devel-switch-user ul.links li {
+  display: inline;
+  margin-left: 0;
+  padding-right: 1.5em;
+}
+
+div#block-devel-switch-user form {
+  clear: both;
+}
+
+div#content div#block-devel-switch-user div.form-item-username,
+div#footer div#block-devel-switch-user div.form-item-username {
+  float: left;
+  margin-right: 2em;
+}
+
+div#content div#block-devel-switch-user .form-submit {
+  margin-top: 5px;
+}
diff --git a/devel.module b/devel.module
index 0adec33..c937883 100644
--- a/devel.module
+++ b/devel.module
@@ -737,6 +737,7 @@ function devel_block_view($delta) {
 function devel_block_switch_user() {
   $links = devel_switch_user_list();
   if (!empty($links) || user_access('switch users')) {
+    drupal_add_css(drupal_get_path('module', 'devel') . '/devel.css');
     $block['subject'] = t('Switch user');
     $build['devel_links'] = array('#theme' => 'links', '#links' => $links);
     if (variable_get('devel_switch_user_show_form', TRUE)) {
@@ -825,7 +826,7 @@ function devel_switch_user_list() {
   }
   if (array_key_exists($user->uid, $links)) {
     $links[$user->uid]['title'] = '<strong>' . $links[$user->uid]['title'] . '</strong>';
-  }  
+  }
   return $links;
 }