diff --git a/client/pages/connectpage.js b/client/pages/connectpage.js
index dc2dc9cd..0b8c18f4 100644
--- a/client/pages/connectpage.js
+++ b/client/pages/connectpage.js
@@ -42,9 +42,13 @@ export class ConnectPage extends React.Component {
     authenticate(params){
         this.setState({loading: true});
         Session.authenticate(params)
-            .then((ok) => {
+            .then((path) => {
+                let url = '/files/';
+                if(path){
+                    url += path.replace(/^\/?(.*?)\/?$/, "$1") + "/";
+                }
                 cache.destroy();
-                this.props.history.push('/files/');
+                this.props.history.push(url);
             })
             .catch((err) => {
                 this.setState({loading: false});