diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/login.jsp b/libresonic-main/src/main/webapp/WEB-INF/jsp/login.jsp
index d4f83470..08b4d80e 100644
--- a/libresonic-main/src/main/webapp/WEB-INF/jsp/login.jsp
+++ b/libresonic-main/src/main/webapp/WEB-INF/jsp/login.jsp
@@ -1,5 +1,5 @@
 <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="iso-8859-1"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE html>
 
 <html><head>
     <%@ include file="head.jsp" %>
@@ -12,57 +12,50 @@
 </head>
 <body style="min-width:550px" class="mainframe bgcolor1" onload="document.getElementById('j_username').focus()">
 
-<form action="<c:url value="/login"/>" method="POST">
+    <form action="<c:url value="/login"/>" method="POST">
+        <sec:csrfInput />
 
-    <sec:csrfInput />
-    <div class="bgcolor2 shadow" align="center" style="padding:20px 50px 20px 50px; margin-top:100px;margin-left:50px;margin-right:50px">
+        <div id="loginframe" class="bgcolor2 shadow">
 
-        <div style="margin-bottom:1em;max-width:50em;text-align:center;"><sub:wiki text="${model.loginMessage}"/></div>
+            <img src="<spring:theme code="logoImage"/>" alt="">
 
-        <table>
-            <tr>
-                <td colspan="2" align="center" style="padding-bottom:10px">
-                    <img src="<spring:theme code="logoImage"/>" alt="">
-                </td>
-            </tr>
+            <div class="loginmessagetop"><sub:wiki text="${model.loginMessage}"/></div>
 
-            <tr>
-                <td align="center"><input type="text" id="j_username" name="j_username" style="width:20rem" tabindex="1" placeholder="<fmt:message key="login.username"/>"></td>
-            </tr>
+            <input type="text" id="j_username" name="j_username" tabindex="1" placeholder="<fmt:message key="login.username"/>">
 
-            <tr>
-                <td align="center" style="padding-bottom:10px"><input type="password" name="j_password" style="width:20rem" tabindex="2" placeholder="<fmt:message key="login.password"/>"></td>
-            </tr>
+            <input type="password" name="j_password" tabindex="2" placeholder="<fmt:message key="login.password"/>">
 
-            <tr>
-                <td align="center" style="padding-bottom:10px"><input id="loginButton" name="submit" style="width:20rem" type="submit" value="<fmt:message key="login.login"/>" tabindex="4"></td>
-            </tr>
+            <input name="submit" type="submit" value="<fmt:message key="login.login"/>" tabindex="4"></td>
 
-            <tr>
-                <td align="center" class="detail" style="padding-bottom:10px">
-                    <div style="display:inline-flex;align-items:center;margin: 0 20%;">
-                        <input type="checkbox" name="remember-me" id="remember" class="checkbox" tabindex="3">
-                        <label for="remember"><fmt:message key="login.remember"/></label>
-                        <a style="margin-left:10px;" href="recover.view"><fmt:message key="login.recover"/></a>
-                    </div>
-                </td>
-            </tr>
+            <div class="details">
+                <div id="loginremember">
+                    <label for="remember"><fmt:message key="login.remember"/></label>
+                    <input type="checkbox" name="remember-me" id="remember" class="checkbox" tabindex="3">
+                </div>
+
+                <a href="recover.view"><fmt:message key="login.recover"/></a>
+            </div>
 
             <c:if test="${model.logout}">
-                <tr align="center"><td colspan="2" style="padding-top:10px"><b><fmt:message key="login.logout"/></b></td></tr>
+                <div class="loginmessagebottom">
+                    <b><fmt:message key="login.logout"/></b>
+                </div>
             </c:if>
 
             <c:if test="${model.error}">
-                <tr align="center"><td colspan="2" style="padding-top:10px"><span class="warning"><fmt:message key="login.error"/></span></td></tr>
+                <div class="loginmessagebottom">
+                    <span class="warning"><fmt:message key="login.error"/></span>
+                </div>
             </c:if>
 
-        </table>
+            <c:if test="${model.insecure}">
+                <div class="loginmessagebottom">
+                    <p class="warning"><fmt:message key="login.insecure"><fmt:param value="${model.brand}"/></fmt:message></p>
+                </div>
+            </c:if>
 
-        <c:if test="${model.insecure}">
-            <p class="warning"><fmt:message key="login.insecure"><fmt:param value="${model.brand}"/></fmt:message></p>
-        </c:if>
+        </div>
+    </form>
 
-    </div>
-</form>
 </body>
 </html>
diff --git a/libresonic-main/src/main/webapp/style/default.css b/libresonic-main/src/main/webapp/style/default.css
index bb5131b1..0564a919 100644
--- a/libresonic-main/src/main/webapp/style/default.css
+++ b/libresonic-main/src/main/webapp/style/default.css
@@ -106,18 +106,57 @@ h2, h2 a, .topHeader a {
     font-weight: normal;
 }
 
-#loginButton {
+/* Login page */
+
+#loginframe {
+    padding: 20px 50px;
+    margin: 100px 50px;
+    display: list-item;
+    list-style: none;
+    text-align: center;
+}
+
+#loginframe > * {
+    margin: 0 auto;
+    display: block;
+}
+
+#loginframe .loginmessagetop {
+    margin-bottom: 1em;
+    max-width: 30rem;
+}
+
+#loginframe input[type=text],
+#loginframe input[type=submit],
+#loginframe input[type=password] {
+    width: 20rem;
+    margin-bottom: 0.5em;
+}
+
+#loginframe input[type=submit] {
+    margin: 1rem auto;
+    padding: 0.3rem;
     background: #2f7bd9;
     color: #f2f2f2;
-    cursor: pointer;
     transition: color 0.2s ease, background 0.2s ease;
 }
 
-#loginButton:hover {
+#loginframe input[type=submit]:hover {
     background: #f2f2f2;
     color: #2d2d2d;
 }
 
+#loginremember {
+    display: inline-flex;
+    align-items: center;
+    margin-right: 10px;
+}
+
+#loginframe .loginmessagebottom {
+    margin-top: 1em;
+    max-width: 50em;
+}
+
 /***************************************************************************************
  * The rest of the CSS is typically not changed in other themes (but not necessarily so).
  ***************************************************************************************/
