diff --git a/libresonic-main/src/main/webapp/WEB-INF/applicationContext-security.xml b/libresonic-main/src/main/webapp/WEB-INF/applicationContext-security.xml
index 5094e70b..4f708566 100644
--- a/libresonic-main/src/main/webapp/WEB-INF/applicationContext-security.xml
+++ b/libresonic-main/src/main/webapp/WEB-INF/applicationContext-security.xml
@@ -60,6 +60,7 @@
                              default-target-url="/index.view"
                              authentication-failure-url="/login.view?error=1"
                              always-use-default-target="true"/>
+        <security:remember-me user-service-ref="securityService" />
     </security:http>
 
     <security:authentication-manager>
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 6209b414..4218a07a 100644
--- a/libresonic-main/src/main/webapp/WEB-INF/jsp/login.jsp
+++ b/libresonic-main/src/main/webapp/WEB-INF/jsp/login.jsp
@@ -35,6 +35,10 @@
 
         <tr>
             <td align="left"><input name="submit" type="submit" value="<fmt:message key="login.login"/>" tabindex="4"></td>
+            <td align="left" class="detail">
+                <input type="checkbox" name="_spring_security_remember_me" id="remember" class="checkbox" tabindex="3">
+                <label for="remember"><fmt:message key="login.remember"/></label>
+            </td>
         </tr>
             <tr>
                 <td></td>