1 files changed, 9 insertions, 5 deletions
diff --git a/webclient/lib/alias.js b/webclient/lib/alias.js
index bd56854..5e4714d 100644
--- a/webclient/lib/alias.js
+++ b/webclient/lib/alias.js
@@ -47,13 +47,17 @@ var Alias = {
       }
         else{
             $('#register').empty();
+	    //populate the register dialog
             var instructions = $(iq).find('instructions');
             if ( instructions.length !== 0 ){
                 $('#register').append('<p>' + instructions.text() + '</p>');
             }
-            var result = form.xmppForm('render');
-            $('#register').append('<p><a href="#" id="generate">Generate</a></p>');
-            $('#generate').click(function(){
+            $('#register').append('<p><a href="#" id="generate-link">Generate</a></p>');
+	    var result = form.xmppForm('render');
+            $('#register').append(result);
+	    $('#register').append('<input type="button" value="Register" id="register-button"/>');
+	    
+	    $('#generate-link').click(function(){
                 var rsa = new RSAKey();
                 rsa.generate(1024, "10001");
                 var pubkey = {
@@ -72,8 +76,7 @@ var Alias = {
                 $("#form-pubkey").val(JSON.stringify(pubkey));
                 $("#form-privkey").val(privkey);
             });
-            $('#register').append(result);
-            $('#register').append('<input type="button" value="register" id="register-button"/>');
+            
             $('#register-button').click(function(){
                 var pubkey = $('<value></value').text($("#form-pubkey").val());
                 var privkey = $('<value></value').text($("#form-privkey").val());
@@ -84,6 +87,7 @@ var Alias = {
                 reg.c('query',{xmlns:'jabber:iq:register'});
                 reg.cnode(form.get(0));
                 Alias.connection.sendIQ(reg);
+		$('#dialogs').dialog('hide', 'register')
             });
             $('#dialogs').dialog('show', 'register');
         }