diff --git a/settings/css/settings.css b/settings/css/settings.css
index 1280f5237a..9d12f001ca 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -187,6 +187,13 @@ input#openid, input#webdav {
 	cursor: pointer;
 }
 
+#personal-settings-container input:disabled {
+	background-color: white;
+	color: black;
+	border: none;
+	opacity: 100;
+}
+
 .verification-dialog {
 	display: none;
 	right: -9px;
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 1eee69c2b5..8245216d1b 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -81,12 +81,9 @@
 				<span class="icon-password"/>
 			</h2>
 			<input type="text" id="displayname" name="displayname"
-				<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
+				<?php if(!$_['displayNameChangeSupported']) { print_unescaped('disabled="1"'); } ?>
 				value="<?php p($_['displayName']) ?>"
 				autocomplete="on" autocapitalize="none" autocorrect="off" />
-			<?php if(!$_['displayNameChangeSupported']) { ?>
-				<span><?php if(isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
-			<?php } ?>
 			<span class="icon-checkmark hidden"/>
 			<?php if($_['lookupServerUploadEnabled']) { ?>
 			<input type="hidden" id="displaynamescope" value="<?php p($_['displayNameScope']) ?>">
@@ -114,13 +111,10 @@
 				}
 				?>">
 			</div>
-			<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
-				<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
-				placeholder="<?php p($l->t('Your email address')); ?>"
+			<input type="email" name="email" id="email" value="<?php if(!$_['displayNameChangeSupported'] && empty($_['email'])) p($l->t('No email address set')); else p($_['email']); ?>"
+				<?php if(!$_['displayNameChangeSupported']) { print_unescaped('disabled="1"'); } ?>
+				placeholder="<?php p($l->t('Your email address')) ?>"
 				autocomplete="on" autocapitalize="none" autocorrect="off" />
-			<?php if(!$_['displayNameChangeSupported']) { ?>
-				<span><?php if(isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
-			<?php } ?>
 			<?php if($_['displayNameChangeSupported']) { ?>
 				<br />
 				<em><?php p($l->t('For password reset and notifications')); ?></em>