diff --git a/plugins/new_user_dialog/composer.json b/plugins/new_user_dialog/composer.json
index 78ea0645c..4a1049f53 100644
--- a/plugins/new_user_dialog/composer.json
+++ b/plugins/new_user_dialog/composer.json
@@ -3,7 +3,7 @@
     "type": "roundcube-plugin",
     "description": "When a new user is created, this plugin checks the default identity and sets a session flag in case it is incomplete. An overlay box will appear on the screen until the user has reviewed/completed his identity.",
     "license": "GPLv3+",
-    "version": "2.1",
+    "version": "2.2",
     "authors": [
         {
             "name": "Thomas Bruederli",
diff --git a/plugins/new_user_dialog/new_user_dialog.php b/plugins/new_user_dialog/new_user_dialog.php
index 6f93fcaca..f16b492e9 100644
--- a/plugins/new_user_dialog/new_user_dialog.php
+++ b/plugins/new_user_dialog/new_user_dialog.php
@@ -53,73 +53,82 @@ class new_user_dialog extends rcube_plugin
             $identities_level = intval($rcmail->config->get('identities_level', 0));
 
             // compose user-identity dialog
-            $table = new html_table(array('cols' => 2));
+            $table = new html_table(array('cols' => 2, 'class' => 'propform'));
 
-            $table->add('title', $this->gettext('name'));
+            $table->add('title', html::label('newuserdialog-name', $this->gettext('name')));
             $table->add(null, html::tag('input', array(
+                    'id'       => 'newuserdialog-name',
                     'type'     => 'text',
                     'name'     => '_name',
                     'value'    => $identity['name'],
                     'disabled' => $identities_level == 4
             )));
 
-            $table->add('title', $this->gettext('email'));
+            $table->add('title', html::label('newuserdialog-email', $this->gettext('email')));
             $table->add(null, html::tag('input', array(
+                    'id'       => 'newuserdialog-email',
                     'type'     => 'text',
                     'name'     => '_email',
                     'value'    => rcube_utils::idn_to_utf8($identity['email']),
                     'disabled' => in_array($identities_level, array(1, 3, 4))
             )));
 
-            $table->add('title', $this->gettext('organization'));
+            $table->add('title', html::label('newuserdialog-org', $this->gettext('organization')));
             $table->add(null, html::tag('input', array(
+                    'id'       => 'newuserdialog-org',
                     'type'     => 'text',
                     'name'     => '_organization',
                     'value'    => $identity['organization'],
                     'disabled' => $identities_level == 4
             )));
 
-            $table->add('title', $this->gettext('signature'));
+            $table->add('title', html::label('newuserdialog-sig', $this->gettext('signature')));
             $table->add(null, html::tag('textarea', array(
+                    'id'   => 'newuserdialog-sig',
                     'name' => '_signature',
-                    'rows' => '3',
+                    'rows' => '5',
                 ),
                 $identity['signature']
             ));
 
             // add overlay input box to html page
             $rcmail->output->add_footer(html::tag('form', array(
-                    'id' => 'newuserdialog',
+                    'id'     => 'newuserdialog',
                     'action' => $rcmail->url('plugin.newusersave'),
-                    'method' => 'post'
+                    'method' => 'post',
+                    'class'  => 'formcontent',
+                    'style'  => 'display: none',
                 ),
-                html::p('hint', rcube::Q($this->gettext('identitydialoghint'))) .
-                    $table->show() .
-                    html::p(array('class' => 'formbuttons'),
-                        html::tag('input', array('type' => 'submit',
-                            'class' => 'button mainaction', 'value' => $this->gettext('save'))))
+                html::p('hint', rcube::Q($this->gettext('identitydialoghint'))) . $table->show()
             ));
 
             $title  = rcube::JQ($this->gettext('identitydialogtitle'));
             $script = "
-$('#newuserdialog').show()
-  .dialog({modal:true, resizable:false, closeOnEscape:false, width:450, title:'$title'})
-  .submit(function() {
-    var i, request = {}, form = $(this).serializeArray();
-    for (i in form)
-      request[form[i].name] = form[i].value;
+var newuserdialog = rcmail.show_popup_dialog($('#newuserdialog'), '$title', [{
+    text: rcmail.get_label('save'),
+    'class': 'mainaction save',
+    click: function() {
+      var request = {};
+      $.each($('form', this).serializeArray(), function() {
+        request[this.name] = this.value;
+      });
 
       rcmail.http_post('plugin.newusersave', request, true);
       return false;
-  });
-
-$('input[name=_name]').focus();
-rcube_webmail.prototype.new_user_dialog_close = function() { $('#newuserdialog').dialog('close'); }
+    }
+  }],
+  {
+    resizable: false,
+    closeOnEscape: false,
+    width: 500,
+    open: function() { $('#newuserdialog').show(); $('#newuserdialog-name').focus(); },
+    beforeClose: function() { return false; }
+  }
+);
+rcube_webmail.prototype.new_user_dialog_close = function() { newuserdialog.dialog('destroy'); };
 ";
             // disable keyboard events for messages list (#1486726)
             $rcmail->output->add_script($script, 'docready');
-
-            $this->include_stylesheet('newuserdialog.css');
         }
     }
 
diff --git a/plugins/new_user_dialog/newuserdialog.css b/plugins/new_user_dialog/newuserdialog.css
deleted file mode 100644
index 207604dd1..000000000
--- a/plugins/new_user_dialog/newuserdialog.css
+++ /dev/null
@@ -1,39 +0,0 @@
-/** Styles for the new-user-dialog box */
-
-#newuserdialog {
-	display: none;
-}
-
-#newuserdialog h3 {
-	color: #333;
-	font-size: normal;
-	margin-top: 0;
-	margin-bottom: 0;
-}
-
-#newuserdialog p.hint {
-	margin-top: 0.5em;
-	margin-bottom: 1em;
-	font-style: italic;
-}
-
-#newuserdialog table td.title {
-	color: #666;
-	text-align: right;
-	padding-right: 1em;
-	white-space: nowrap;
-}
-
-#newuserdialog table td input,
-#newuserdialog table td textarea {
-	width: 20em;
-}
-
-#newuserdialog .formbuttons {
-	margin-top: 1.5em;
-	text-align: center;
-}
-
-.ui-dialog-titlebar-close {
-	display: none;
-}
\ No newline at end of file
diff --git a/skins/classic/common.css b/skins/classic/common.css
index 702077596..e21c4a95d 100644
--- a/skins/classic/common.css
+++ b/skins/classic/common.css
@@ -1084,6 +1084,15 @@ div.searchbox > input
   width: 97%;
 }
 
+.formcontent table {
+  width: 100%;
+}
+
+.formcontent input,
+.formcontent textarea {
+  width: 95%;
+}
+
 .listsearchbox
 {
   border-bottom: solid 1px #ddd;
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index d1d1b0e45..3c87df948 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -1700,6 +1700,15 @@ ul.proplist li {
 	bottom: 0;
 }
 
+.formcontent input,
+.formcontent textarea {
+	width: 95%;
+}
+
+.formcontent .hint {
+	font-style: italic;
+	margin-bottom: 1em;
+}
 
 /*** Login form ***/