diff --git a/index.js b/index.js
index ab350e3..69fd716 100644
--- a/index.js
+++ b/index.js
@@ -3,7 +3,8 @@ const proxy = require('http-proxy-middleware');
 
 var app = express();
 
-app.use(express.static('public'))
+app.use(express.urlencoded({ extended: true }));
+app.use(express.static('public'));
 app.engine('html', require('ejs').renderFile);
 app.set('views', __dirname + '/views');
 app.set('view engine', 'html');
@@ -19,7 +20,7 @@ app.get('/', (req, res) => {
 });
 
 var onProxyReq = function (proxyReq, req, res) {
-    const host = req.query.host || req.headers.host;
+    const host = req.query.host || (req.body && req.body.host) || req.headers.host;
     console.log(req.query.host);
     console.log('host', host);
     proxyReq.setHeader('x-login-host', host);
diff --git a/views/login.html b/views/login.html
index b93c98c..a32a5e7 100644
--- a/views/login.html
+++ b/views/login.html
@@ -267,15 +267,11 @@
       document.getElementById('info').classList.toggle('active');
     }
 
-    function getNext() {
-      var next = /next=(.*)/.exec(window.location.search); // assuming only search param
-      return next ? '&next=' + next[1] : '';
-    }
-
     window.onload = function() {
       var form = document.getElementById('loginForm');
+      var inputHost = document.getElementById('inputHost');
       form.addEventListener('submit', onSubmit);
-      form.setAttribute('action', '/login?host='+ window.location.host + getNext());
+      inputHost.value = window.location.host;
     }
   </script>
 </head>
@@ -329,7 +325,8 @@ <h1>Redash Preview Instance</h1>
       </div>
     </div>
     
-    <form method="post" action="/login" name="login" id="loginForm" onsubmit="onSubmit">
+    <form method="post" name="login" id="loginForm" onsubmit="onSubmit">
+      <input name="host" type="hidden" id="inputHost">
       <input name="email" type="email" id="inputEmail" placeholder="Email address" required autofocus>
       <input name="password" type="password" id="inputPassword" placeholder="Password" required>
       <button type="submit" id="submitButton">