diff --git a/index.php b/index.php
index aff8b1979..e0bc8310d 100755
--- a/index.php
+++ b/index.php
@@ -158,7 +158,7 @@ if (isset($username)) {
 echo ' required>
 					</div>
 
-					{[ "type": "password", "name": "password", "autocomplete": "current-password", "placeholder": "'.tr('Password').'", "icon-before": "<i class=\"fa fa-lock\"></i>" ]}
+					{[ "type": "password", "name": "password", "autocomplete": "current-password", "placeholder": "'.tr('Password').'", "icon-before": "<i class=\"fa fa-lock\"></i>", "extra": "no-generate-pwd" ]}
 
                     <div class="text-right">
                         <small><a href="'.base_path().'/reset.php">'.tr('Password dimenticata?').'</a></small>
diff --git a/src/HTMLBuilder/Handler/DefaultHandler.php b/src/HTMLBuilder/Handler/DefaultHandler.php
index 5e1f26e71..af4c2e155 100755
--- a/src/HTMLBuilder/Handler/DefaultHandler.php
+++ b/src/HTMLBuilder/Handler/DefaultHandler.php
@@ -101,7 +101,10 @@ class DefaultHandler implements HandlerInterface
      */
     protected function password(&$values, &$extras)
     {
-        $values['icon-after'] = '<i onclick="generatePassword_'.$values['id'].'()" class="clickable fa fa-cog"  id="'.$values['id'].'_generate"></i> | <i onclick="togglePassword_'.$values['id'].'()" class="clickable fa" id="'.$values['id'].'_toggle"></i>';
+        if (empty(intval($extras))){
+            $values['icon-after'] = '<i onclick="generatePassword_'.$values['id'].'()" class="clickable fa fa-cog"  id="'.$values['id'].'_generate"></i> | ';
+        }
+        $values['icon-after'] .= '<i onclick="togglePassword_'.$values['id'].'()" class="clickable fa" id="'.$values['id'].'_toggle"></i>';
 
         $result = '
     <script>