diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 2fccfd1f71..fcca43624f 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -64,7 +64,7 @@
 					</li>
 				<?php endforeach; ?>
 					<li>
-						<a id="logout" <?php print OC_User::getLogoutAttribute(); ?>>
+						<a id="logout" <?php print_unescaped(OC_User::getLogoutAttribute()); ?>>
 							<img class="svg" alt="" src="<?php print_unescaped(image_path('', 'actions/logout.svg')); ?>" />
 							<?php p($l->t('Log out'));?>
 						</a>
diff --git a/lib/private/user.php b/lib/private/user.php
index f7661f8d83..0284e8044f 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -327,7 +327,7 @@ class OC_User {
 			}
 		}
 
-		return print_unescaped("href=".link_to('', 'index.php'))."?logout=true";
+		return "href=" . link_to('', 'index.php') . "?logout=true";
 	}
 
 	/**