diff --git a/src/oauth2views/login.ejs b/src/oauth2views/login.ejs
index d64051551..78000ec5e 100644
--- a/src/oauth2views/login.ejs
+++ b/src/oauth2views/login.ejs
@@ -27,11 +27,11 @@
                             <input type="hidden" name="_csrf" value="<%= csrf %>"/>
                             <div class="form-group">
                                 <label class="control-label" for="inputUsername">Username or Email</label>
-                                <input type="text" class="form-control" id="inputUsername" name="username" autofocus required>
+                                <input type="text" class="form-control" id="inputUsername" name="username" value="<%= username %>" autofocus required>
                             </div>
                             <div class="form-group">
                                 <label class="control-label" for="inputPassword">Password</label>
-                                <input type="password" class="form-control" name="password" id="inputPassword" required>
+                                <input type="password" class="form-control" name="password" id="inputPassword" value="<%= password %>" required>
                             </div>
                             <input class="btn btn-primary btn-outline pull-right" type="submit" value="Sign in"/>
                         </form>
diff --git a/src/routes/oauth2.js b/src/routes/oauth2.js
index 79e08101f..b5f4890e8 100644
--- a/src/routes/oauth2.js
+++ b/src/routes/oauth2.js
@@ -193,12 +193,16 @@ function loginForm(req, res) {
     if (!u.query.client_id) return sendErrorPageOrRedirect(req, res, 'Invalid login request. No client_id provided.');
 
     function render(applicationName, applicationLogo) {
+        var error = req.query.error || null;
+
         renderTemplate(res, 'login', {
             adminOrigin: config.adminOrigin(),
             csrf: req.csrfToken(),
             applicationName: applicationName,
             applicationLogo: applicationLogo,
-            error: req.query.error || null,
+            error: error,
+            username: config.isDemo() ? constants.DEMO_USERNAME : '',
+            password: config.isDemo() ? 'cloudron' : '',
             title: applicationName + ' Login'
         });
     }