diff --git a/src/sunstone/public/js/plugins/config-tab.js b/src/sunstone/public/js/plugins/config-tab.js
index 9aa8e549d2..4fff770c87 100644
--- a/src/sunstone/public/js/plugins/config-tab.js
+++ b/src/sunstone/public/js/plugins/config-tab.js
@@ -138,6 +138,20 @@ var config_tab_content =
                 </tbody>\
             </table>\
         </div>\
+        <div class="large-5 columns">' +
+         '<table class="dataTable extended_table" cellpadding="0" cellspacing="0" border="0">\
+             <thead>\
+                 <tr>\
+                     <th>' + tr("Public SSH Key") + '</th>\
+                     <th>\
+                         <a class="config_ssh_public_key_edit right" href="#"><i class="fa fa-pencil-square-o"></i></a>\
+                     </th>\
+                 </tr>\
+             </thead>\
+          </table>\
+         <textarea rows="6" type="text" id="config_ssh_public_key_textarea" name="ssh_public_key" class="hidden"/>\
+         <p id="config_ssh_public_key_text" name="ssh_public_key"></p>\
+        </div>\
       </div>\
       <div class="row">\
         <div id="setting_user_template" class="large-12 columns">'+
@@ -303,6 +317,38 @@ function setupConfigDialog() {
 
     dialog.addClass("reveal-modal large max-height").attr("data-reveal", "");
 
+    $(".config_ssh_public_key_edit", '#config_dialog').on("click", function(){
+        $("#config_ssh_public_key_text", '#config_dialog').hide();
+        $("#config_ssh_public_key_textarea", '#config_dialog').show().focus();
+    });
+
+    $("#config_ssh_public_key_textarea", '#config_dialog').on("change", function(){
+        var user_id = getSelectedNodes(dataTable_users)[0];
+
+        OpenNebula.User.show({
+            data : {
+                id: -1
+            },
+            success: function(request,user_json){
+              var template = user_json.USER.TEMPLATE;
+
+              template["SSH_PUBLIC_KEY"] = $("#config_ssh_public_key_textarea", '#config_dialog').val();
+
+              template_str = "";
+              $.each(template,function(key,value){
+                template_str += (key + '=' + '"' + value + '"\n');
+              });
+
+              Sunstone.runAction("UserSettings.update_template", -1, template_str);
+            }
+        })
+    });
+
+    $("#config_ssh_public_key_textarea", '#config_dialog').on("focusout", function(){
+      $("#config_ssh_public_key_text", '#config_dialog').show();
+      $("#config_ssh_public_key_textarea", '#config_dialog').hide();
+    });
+
     setupTips(dialog);
 
     if (config['user_config']["vnc_wss"] == "yes"){
@@ -415,11 +461,22 @@ function updateUserConfigInfo(request,user_json) {
         <td class="value_td" colspan="2"><button id="update_password" type="button" class="button tiny radius" >' + tr("Update password") + '</button></td>\
     </tr>')
 
+    var ssh_key;
+    if (info.TEMPLATE.SSH_PUBLIC_KEY) {
+        ssh_key = info.TEMPLATE.SSH_PUBLIC_KEY;
+        delete info.TEMPLATE.SSH_PUBLIC_KEY;
+        $("#config_ssh_public_key_text", "#config_dialog").text(ssh_key);
+        $("#config_ssh_public_key_textarea", "#config_dialog").val(ssh_key);
+    } else {
+      $("#config_ssh_public_key_text", "#config_dialog").text(tr("You can provide a SSH Key for this User clicking on the edit button"))
+    };
+
     $("#setting_user_template").html(
         insert_extended_template_table(info.TEMPLATE,
                                           "UserSettings",
                                           "-1",
-                                          tr("Custom Attributes"))
+                                          tr("Custom Attributes"),
+                                          {SSH_PUBLIC_KEY: ssh_key})
     )
 
     $("#div_edit_chg_group_link").die();
diff --git a/src/sunstone/public/js/plugins/users-tab.js b/src/sunstone/public/js/plugins/users-tab.js
index f247e26ee7..f1abb66774 100644
--- a/src/sunstone/public/js/plugins/users-tab.js
+++ b/src/sunstone/public/js/plugins/users-tab.js
@@ -594,7 +594,7 @@ function updateUserInfo(request,user){
             </thead>\
          </table>\
         <textarea rows="6" type="text" id="user_ssh_public_key_textarea" name="ssh_public_key" class="hidden"/>\
-        <p id="user_ssh_public_key_text" name="ssh_public_key" style="font-size: 0.875rem; color: #777; padding: 0px 10px; overflow-x:hidden; text-overflow: ellipsis; height: 120px;">'+tr("You can provide a SSH Key for this User clicking on the edit button")+'</p>\
+        <p id="user_ssh_public_key_text" name="ssh_public_key">'+tr("You can provide a SSH Key for this User clicking on the edit button")+'</p>\
        </div>\
      </div>\
      <div class="row">\
@@ -657,11 +657,6 @@ function updateUserInfo(request,user){
         Config.isTabActionEnabled("users-tab", "User.quotas_dialog"),
         "User");
 
-    if (ssh_key) {
-        $("#user_ssh_public_key_text", "#user_info_panel").text(ssh_key);
-        $("#user_ssh_public_key_textarea", "#user_info_panel").val(ssh_key);
-    }
-
     $(".user_ssh_public_key_edit", "#user_info_panel").on("click", function(){
         $("#user_ssh_public_key_text", "#user_info_panel").hide();
         $("#user_ssh_public_key_textarea", "#user_info_panel").show().focus();