diff --git a/prefs.php b/prefs.php
index ac874a8e4..85a01663c 100644
--- a/prefs.php
+++ b/prefs.php
@@ -66,7 +66,19 @@
 			</td>
 		</tr><tr><td class="welcomePrompt">
 			<? if (!SINGLE_USER_MODE) { ?>
-			Hello, <b><?= $_SESSION["name"] ?></b> (<a href="logout.php">Logout</a>)</td>
+			<? if (USE_HTTP_AUTH) { ?>
+				<table align="right"><tr>
+				<td class="httpWelcomePrompt">Hello, <b> <?= $_SESSION["name"] ?></b></td>
+				<td><form action="tt-rss.php" method="POST">
+					<input type="hidden" name="ForceLogout" value="yes">
+					<input type="submit" class="button" value="Logout">
+				</form>
+				</td></tr></table>
+			<? } else { ?>
+				Hello, <b><?= $_SESSION["name"] ?></b>
+				(<a href="logout.php">Logout</a>)
+			<? } ?>
+			</td>			
 			<? } ?>
 		</tr></table>
 	</td>
diff --git a/tt-rss.php b/tt-rss.php
index 9e04bc677..e88dd19d0 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -80,14 +80,15 @@
 			<? if (!SINGLE_USER_MODE) { ?>
 			<? if (USE_HTTP_AUTH) { ?>
 				<table align="right"><tr>
-				<td class="httpWelcomePrompt">Hello, <b><?= $_SESSION["name"] ?></b></td>
+				<td class="httpWelcomePrompt">Hello, <b> <?= $_SESSION["name"] ?></b></td>
 				<td><form action="tt-rss.php" method="POST">
 					<input type="hidden" name="ForceLogout" value="yes">
 					<input type="submit" class="button" value="Logout">
 				</form>
 				</td></tr></table>
 			<? } else { ?>
-				Hello, <b><?= $_SESSION["name"] ?></b>(<a href="logout.php">Logout</a>)
+				Hello, <b><?= $_SESSION["name"] ?></b>
+				(<a href="logout.php">Logout</a>)
 			<? } ?>
 			</td>			
 			<? } ?>