diff --git a/settings/js/federationsettingsview.js b/settings/js/federationsettingsview.js
index f89aad2afd..1a0a3dcb4d 100644
--- a/settings/js/federationsettingsview.js
+++ b/settings/js/federationsettingsview.js
@@ -165,13 +165,13 @@
 			if (verifyAvailable) {
 				if (field === 'twitter' || field === 'website') {
 					var verifyStatus = this.$('#' + field + 'form > .verify > #verify-' + field);
-					verifyStatus.attr('title', t('core', 'Verify'));
+					verifyStatus.attr('data-origin-title', t('core', 'Verify'));
 					verifyStatus.attr('src', OC.imagePath('core', 'actions/verify.svg'));
 					verifyStatus.data('status', '0');
 					verifyStatus.addClass('verify-action');
 				} else if (field === 'email') {
 					var verifyStatus = this.$('#' + field + 'form > .verify > #verify-' + field);
-					verifyStatus.attr('title', t('core', 'Verifying …'));
+					verifyStatus.attr('data-origin-title', t('core', 'Verifying …'));
 					verifyStatus.data('status', '1');
 					verifyStatus.attr('src', OC.imagePath('core', 'actions/verifying.svg'));
 				}
diff --git a/settings/js/personal.js b/settings/js/personal.js
index cd9fd3498b..254ee8f415 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -232,7 +232,7 @@ $(document).ready(function () {
 			).done(function (data) {
 				var dialog = verify.children('.verification-dialog');
 				showVerifyDialog($(dialog), data.msg, data.code);
-				indicator.attr('title', t('core', 'Verifying …'));
+				indicator.attr('data-origin-title', t('core', 'Verifying …'));
 				indicator.attr('src', OC.imagePath('core', 'actions/verifying.svg'));
 				indicator.data('status', '1');
 			});
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index ad698c3772..3e30d77539 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -100,18 +100,19 @@
 				<span class="icon-password"/>
 			</h2>
 			<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') p('hidden'); ?>">
-				<img id="verify-email" <?php
+				<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
+				<?php
 				switch($_['emailVerification']) {
 					case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
-						print_unescaped('src="' . image_path('core', 'actions/verifying.svg') . '"');
+						p(image_path('core', 'actions/verifying.svg'));
 						break;
 					case \OC\Accounts\AccountManager::VERIFIED:
-						print_unescaped('src="' . image_path('core', 'actions/verified.svg') . '"');
+						p(image_path('core', 'actions/verified.svg'));
 						break;
 					default:
-						print_unescaped('src="' . image_path('core', 'actions/verify.svg') . '"');
+						p(image_path('core', 'actions/verify.svg'));
 				}
-				?> title="<?php p($_['emailMessage']); ?>">
+				?>">
 			</div>
 			<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
 				<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
@@ -166,18 +167,21 @@
 				<span class="icon-password"/>
 			</h2>
 			<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') p('hidden'); ?>">
-				<img id="verify-website" data-status="<?php p($_['websiteVerification']) ?>" <?php
+				<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
+				<?php
 				switch($_['websiteVerification']) {
 					case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
-						print_unescaped('src="' . image_path('core', 'actions/verifying.svg') . '" class="verify-action"');
+						p(image_path('core', 'actions/verifying.svg'));
 						break;
 					case \OC\Accounts\AccountManager::VERIFIED:
-						print_unescaped('src="' . image_path('core', 'actions/verified.svg') . '"');
+						p(image_path('core', 'actions/verified.svg'));
 						break;
 					default:
-						print_unescaped('src="' . image_path('core', 'actions/verify.svg') . '" class="verify-action"');
+						p(image_path('core', 'actions/verify.svg'));
 				}
-				?> title="<?php p($_['websiteMessage']); ?>">
+				?>"
+				<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
+				>
 				<div class="verification-dialog popovermenu bubble menu">
 					<div class="verification-dialog-content">
 						<p class="explainVerification"></p>
@@ -200,18 +204,21 @@
 				<span class="icon-password"/>
 			</h2>
 			<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') p('hidden'); ?>">
-				<img id="verify-twitter" <?php
+				<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
+				<?php
 				switch($_['twitterVerification']) {
 					case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
-						print_unescaped('src="' . image_path('core', 'actions/verifying.svg') . '" class="verify-action"');
+						p(image_path('core', 'actions/verifying.svg'));
 						break;
 					case \OC\Accounts\AccountManager::VERIFIED:
-						print_unescaped('src="' . image_path('core', 'actions/verified.svg') . '"');
+						p(image_path('core', 'actions/verified.svg'));
 						break;
 					default:
-						print_unescaped('src="' . image_path('core', 'actions/verify.svg') . '" class="verify-action"');
+						p(image_path('core', 'actions/verify.svg'));
 				}
-				?> title="<?php p($_['twitterMessage']); ?>">
+				?>"
+				<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
+				>
 				<div class="verification-dialog popovermenu bubble menu">
 					<div class="verification-dialog-content">
 						<p class="explainVerification"></p>