diff --git a/settings/css/settings.css b/settings/css/settings.css
index 83e037d53f5..864813c3d5a 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -168,7 +168,7 @@ input#openid, input#webdav {
 	width: 17em;
 }
 
-#personal-settings-container > div > form span[class^="icon-checkmark"] {
+#personal-settings-container > div > form span[class^="icon-checkmark"], #personal-settings-container > div > form span[class^="icon-error"] {
 	position: absolute;
 	left: 228px;
 	top: 82px;
diff --git a/settings/js/federationsettingsview.js b/settings/js/federationsettingsview.js
index 1a0a3dcb4d1..8edce271f2f 100644
--- a/settings/js/federationsettingsview.js
+++ b/settings/js/federationsettingsview.js
@@ -108,9 +108,12 @@
 				}
 			});
 
-			$.when(savingData).done(function() {
-				//OC.msg.finishedSaving('#personal-settings-container .msg', result)
-				self._showInputChangeSuccess(field);
+			$.when(savingData).done(function(data) {
+				if (data.status === "success") {
+					self._showInputChangeSuccess(field);
+				} else {
+					self._showInputChangeFail(field);
+				}
 			});
 		},
 
@@ -178,6 +181,14 @@
 			}
 		},
 
+		_showInputChangeFail: function(field) {
+			var $icon = this.$('#' + field + 'form > .icon-error');
+			$icon.fadeIn(200);
+			setTimeout(function() {
+				$icon.fadeOut(300);
+			}, 2000);
+		},
+
 		_setFieldScopeIcon: function(field, scope) {
 			var $icon = this.$('#' + field + 'form > h2 > span');
 			$icon.removeClass('icon-password');
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 9bb96ba22ce..07356979e37 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -66,7 +66,7 @@
 				<div class="inlineblock button primary" id="sendcropperbutton"><?php p($l->t('Choose as profile picture')); ?></div>
 			</div>
 		</div>
-		<span class="icon-checkmark hidden"/>
+		<span class="icon-checkmark hidden"></span>
 		<?php if($_['lookupServerUploadEnabled']) { ?>
 		<input type="hidden" id="avatarscope" value="<?php p($_['avatarScope']) ?>">
 		<?php } ?>
@@ -84,7 +84,8 @@
 				<?php if(!$_['displayNameChangeSupported']) { print_unescaped('disabled="1"'); } ?>
 				value="<?php p($_['displayName']) ?>"
 				autocomplete="on" autocapitalize="none" autocorrect="off" />
-			<span class="icon-checkmark hidden"/>
+			<span class="icon-checkmark hidden" ></span>
+			<span class="icon-error hidden" ></span>
 			<?php if($_['lookupServerUploadEnabled']) { ?>
 			<input type="hidden" id="displaynamescope" value="<?php p($_['displayNameScope']) ?>">
 			<?php } ?>
@@ -119,7 +120,8 @@
 				<br />
 				<em><?php p($l->t('For password reset and notifications')); ?></em>
 			<?php } ?>
-			<span class="icon-checkmark hidden"/>
+			<span class="icon-checkmark hidden"></span>
+			<span class="icon-error hidden" ></span>
 			<?php if($_['lookupServerUploadEnabled']) { ?>
 			<input type="hidden" id="emailscope" value="<?php p($_['emailScope']) ?>">
 			<?php } ?>