diff --git a/src/main/java/com/commafeed/frontend/CommaFeedApplication.java b/src/main/java/com/commafeed/frontend/CommaFeedApplication.java
index b98ecaea..49fc974b 100644
--- a/src/main/java/com/commafeed/frontend/CommaFeedApplication.java
+++ b/src/main/java/com/commafeed/frontend/CommaFeedApplication.java
@@ -35,6 +35,7 @@ import org.apache.wicket.util.cookies.CookieUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.commafeed.frontend.pages.DemoLoginPage;
 import com.commafeed.frontend.pages.FaviconPage;
 import com.commafeed.frontend.pages.GoogleImportCallbackPage;
 import com.commafeed.frontend.pages.GoogleImportRedirectPage;
@@ -53,6 +54,7 @@ public class CommaFeedApplication extends AuthenticatedWebApplication {
 		super.init();
 
 		mountPage("welcome", WelcomePage.class);
+		mountPage("demo", DemoLoginPage.class);
 		mountPage("logout", LogoutPage.class);
 		mountPage("error", DisplayExceptionPage.class);
 		mountPage("favicon", FaviconPage.class);
diff --git a/src/main/java/com/commafeed/frontend/pages/DemoLoginPage.java b/src/main/java/com/commafeed/frontend/pages/DemoLoginPage.java
new file mode 100644
index 00000000..df552b6e
--- /dev/null
+++ b/src/main/java/com/commafeed/frontend/pages/DemoLoginPage.java
@@ -0,0 +1,23 @@
+package com.commafeed.frontend.pages;
+
+import javax.inject.Inject;
+
+import org.apache.wicket.markup.html.WebPage;
+
+import com.commafeed.backend.StartupBean;
+import com.commafeed.backend.services.UserService;
+import com.commafeed.frontend.CommaFeedSession;
+
+public class DemoLoginPage extends WebPage {
+
+	private static final long serialVersionUID = 1L;
+
+	@Inject
+	UserService userService;
+
+	public DemoLoginPage() {
+		CommaFeedSession.get().authenticate(StartupBean.USERNAME_DEMO,
+				StartupBean.USERNAME_DEMO);
+		setResponsePage(getApplication().getHomePage());
+	}
+}
diff --git a/src/main/java/com/commafeed/frontend/pages/WelcomePage.html b/src/main/java/com/commafeed/frontend/pages/WelcomePage.html
index 6aa1fedb..b522337b 100644
--- a/src/main/java/com/commafeed/frontend/pages/WelcomePage.html
+++ b/src/main/java/com/commafeed/frontend/pages/WelcomePage.html
@@ -13,6 +13,8 @@
 				</div>
 				<h4 class="text-center">
 					CommaFeed is a bloat-free feed reader. It aims to replace Google Reader while keeping things simple.
+					<br />
+					<a wicket:id="demo-login">Try out the demo.</a>
 				</h4>
 			</div>
 			<div class="row">
diff --git a/src/main/java/com/commafeed/frontend/pages/WelcomePage.java b/src/main/java/com/commafeed/frontend/pages/WelcomePage.java
index 90ae6b05..5e9889f5 100644
--- a/src/main/java/com/commafeed/frontend/pages/WelcomePage.java
+++ b/src/main/java/com/commafeed/frontend/pages/WelcomePage.java
@@ -19,6 +19,7 @@ public class WelcomePage extends BasePage {
 	public WelcomePage() {
 		add(new BookmarkablePageLink<Void>("logo-link", getApplication()
 				.getHomePage()));
+		add(new BookmarkablePageLink<Void>("demo-login", DemoLoginPage.class));
 		add(new LoginPanel("login"));
 		add(new RegisterPanel("register") {
 			@Override