diff --git a/src/public/js/app.js b/src/public/js/app.js
index 63b88fb..071d2ef 100644
--- a/src/public/js/app.js
+++ b/src/public/js/app.js
@@ -78,7 +78,7 @@ ReactDOM.render((
   <Provider store={store}>
     <Router history={history}>
       <Route path="/" component={App}>
-        <IndexRedirect to="/users/login" />
+        <IndexRedirect to="/movies/polochon" />
         <Route path="/users/login" component={UserLoginForm} />
         <Route path="/users/signup" component={UserSignUp} />
         <Route path="/users/edit" component={UserIsAuthenticated(UserEdit)} />
diff --git a/src/public/js/components/users/login.js b/src/public/js/components/users/login.js
index 5036199..4b36812 100644
--- a/src/public/js/components/users/login.js
+++ b/src/public/js/components/users/login.js
@@ -5,6 +5,18 @@ export default class UserLoginForm extends React.Component {
     super(props);
     this.handleSubmit = this.handleSubmit.bind(this);
   }
+  componentWillReceiveProps(nextProps) {
+    if (!nextProps.userStore.isLogged) {
+      return
+    }
+    if (!nextProps.location.query.redirect) {
+      // Redirect home
+      nextProps.router.push('/');
+    } else {
+      // Redirect to the previous page
+      nextProps.router.push(nextProps.location.query.redirect);
+    }
+  }
   handleSubmit(e) {
     e.preventDefault();
     if (this.props.userStore.userLoading) {