3 files changed, 8 insertions, 3 deletions
diff --git a/skins/default/settings.css b/skins/default/settings.css
index 19f4aa8c4..01c24bd79 100644
--- a/skins/default/settings.css
+++ b/skins/default/settings.css
@@ -161,6 +161,11 @@ span.tablink-selected a
   padding-right: 10px;
 }
 
+input.disabled
+{
+  color: #999999;
+}
+
 #bottomboxes
 {
   position: absolute;
diff --git a/skins/default/templates/editidentity.html b/skins/default/templates/editidentity.html
index bac7579dd..0d1f6a4ab 100644
--- a/skins/default/templates/editidentity.html
+++ b/skins/default/templates/editidentity.html
@@ -17,7 +17,7 @@
 </div>
 
 <p id="listbuttons">
-<roundcube:button command="add" type="input" label="newidentity" class="button" condition="config:multiple_identities:true" />
+<roundcube:button command="add" type="input" label="newidentity" class="button" condition="config:identities_level:0<2" />
 </p>
 
 <div id="identity-details">
@@ -27,7 +27,7 @@
 <roundcube:object name="identityform" size="40" textareacols="60" textarearows="6" />
 
 <p><br />
-<roundcube:button command="delete" type="input" class="button" label="delete" condition="env:action=='edit-identity'&&config:multiple_identities:true" style="margin-right:0.5em" />
+<roundcube:button command="delete" type="input" class="button" label="delete" condition="env:action=='edit-identity'" style="margin-right:0.5em" />
 <roundcube:button command="save" type="input" class="button mainaction" label="save" />
 </p>
 </div>
diff --git a/skins/default/templates/identities.html b/skins/default/templates/identities.html
index bb29c61e6..1609fbe0f 100644
--- a/skins/default/templates/identities.html
+++ b/skins/default/templates/identities.html
@@ -17,7 +17,7 @@
 </div>
 
 <p id="listbuttons">
-<roundcube:button command="add" type="input" label="newidentity" class="button" condition="config:multiple_identities:true" />
+<roundcube:button command="add" type="input" label="newidentity" class="button" condition="config:identities_level:0<2" />
 </p>
 
 <div id="identity-details">