diff --git a/settings/js/federationsettingsview.js b/settings/js/federationsettingsview.js
index 7a629fc2ab..b71b450546 100644
--- a/settings/js/federationsettingsview.js
+++ b/settings/js/federationsettingsview.js
@@ -137,7 +137,7 @@
 
 			this._config.set(field + 'Scope', scope);
 
-			$('#' + field).parent().find('span > input').val(scope);
+			$('#' + field + 'scope').val(scope);
 
 			// TODO: user loading/success feedback
 			this._config.save();
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index b81b19d906..8b5931c369 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -60,6 +60,7 @@
 				<div class="inlineblock button primary" id="sendcropperbutton"><?php p($l->t('Choose as profile picture')); ?></div>
 			</div>
 		</div>
+		<span class="icon-checkmark hidden"/>
 		<input type="hidden" id="avatarscope" value="<?php p($_['avatarScope']) ?>">
 	</form>
 </div>