diff --git a/images/ttrss_logo_big.png b/images/ttrss_logo_big.png
index 013f95791..b2c59d176 100644
Binary files a/images/ttrss_logo_big.png and b/images/ttrss_logo_big.png differ
diff --git a/login.php b/login.php
index 577e5466b..60e0cb1ea 100644
--- a/login.php
+++ b/login.php
@@ -6,6 +6,8 @@
 	require_once "config.php";
 	require_once "functions.php";
 
+	$error_msg = "";
+
 	$url_path = get_script_urlpath();
 
 	if (ENABLE_LOGIN_SSL) {		
@@ -61,7 +63,11 @@
 			}
 			header("Location: $redirect_base/$return_to");
 			exit;
+		} else {
+			$error_msg = "Error: Unable to authenticate user. Please check login and password.";
 		}
+	} else {
+		$error_msg = "Error: Either login or password is blank.";
 	}
 
 ?>
@@ -97,38 +103,46 @@ if (document.addEventListener) {
 window.onload = init;
 </script>
 
-<table width='100%' height='100%' class="loginForm">
+<form action="login.php" method="POST" name="loginForm">
 
-	<tr><td align='center' valign='middle'>
+<table width="100%" class="loginForm2">
+<tr>
+	<td class="loginTop" valign="bottom" align="left">
+		<img src="images/ttrss_logo_big.png" alt="Logo">
+	</td>
+</tr><tr>
+	<td align="center" valign="middle" class="loginMiddle" height="100%">
+		<? if ($error_msg) { ?>
+			<div class="loginError"><?= $error_msg ?></div>
+		<? } ?>
+		<table>
+			<tr><td align="right">Login:</td>
+			<td><input name="login"></td></tr>
+			<tr><td align="right">Password:</td>
+			<td><input type="password" name="password"></td></tr>
+			<tr><td colspan="2">
+				<input type="checkbox" name="remember_me" id="remember_me">
+				<label for="remember_me">Remember me on this computer</label>
+			</td></tr>
+			<tr><td colspan="2" align="right">
+				<input type="submit" class="button" value="Login">
+			<input type="hidden" name="rt" value="<?= $_GET['rt'] ?>">
+			</td></tr>
+		</table>
+	</td>
+</tr><tr>
+	<td align="center" class="loginBottom">
+		<a href="http://tt-rss.spb.ru/">Tiny-Tiny RSS</a> v<?= VERSION ?> &copy; 2005-2006 Andrew Dolgov
+		<? if (WEB_DEMO_MODE) { ?>
+		<br>Running in demo mode, some functionality is disabled.
+		<? } ?>
+	</td>
+</tr>
 
-	<form action="login.php" method="POST" name="loginForm">
-	
-	<table class="innerLoginForm">
-
-	<tr><td valign="middle" align="center" colspan="2">
-		<img src="images/ttrss_logo.png" alt="logo">
-	</td></tr>
-	
-	<tr><td align="right">Login:</td>
-		<td><input name="login"></td></tr>
-	<tr><td align="right">Password:</td>
-		<td><input type="password" name="password"></td></tr>
-	<tr><td>&nbsp;</td><td>
-			<input type="checkbox" name="remember_me" id="remember_me">
-			<label for="remember_me">Remember me</label>
-	</td></tr>
-	<tr><td colspan="2" align="center">
-		<input type="submit" class="button" value="Login">
-		<input type="hidden" name="rt" value="<?= $_GET['rt'] ?>">
-	</td></tr>
-	
-	</table>
-	
-	</form>
-
-	</td></tr>
 </table>
 
+</form>
+
 <? db_close($link); ?>
 
 <script type="text/javascript">
diff --git a/tt-rss.css b/tt-rss.css
index f8f155b73..a96f7b575 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -1171,3 +1171,37 @@ span.debugTS {
 	padding : 3px;
 	font-weight : bold;
 }
+
+table.loginForm2 {
+	padding : 1em;
+}
+
+table.loginForm2 .loginTop {
+	border-width : 0px 0px 1px 0px;
+	border-color : #88b0f0;
+	border-style : solid;
+	padding : 0.5em;
+}
+
+table.loginForm2 .loginMiddle {
+	padding : 3em;
+}
+
+table.loginForm2 .loginBottom {
+	border-width : 1px 0px 0px 0px;
+	border-color : #88b0f0;
+	border-style : solid;
+	font-size : x-small;
+	text-align : center;
+	color : #909090;
+	padding : 0.5em;
+}
+
+table.loginForm2 .loginBottom a {
+	color : #909090;
+}
+
+.loginError {
+	color : red;
+	margin : 0.5em;
+}