diff --git a/webapp/components/login/login_controller.jsx b/webapp/components/login/login_controller.jsx
index e54f2cbfa9..3d0b5d24e6 100644
--- a/webapp/components/login/login_controller.jsx
+++ b/webapp/components/login/login_controller.jsx
@@ -210,7 +210,7 @@ export default class LoginController extends React.Component {
     finishSignin(team) {
         const query = this.props.location.query;
         GlobalActions.loadCurrentLocale();
-        if (query.redirect_to && query.redirect_to.match(/^\//)) {
+        if (query.redirect_to && query.redirect_to.match(/^\/([^/]|$)/)) {
             browserHistory.push(query.redirect_to);
         } else if (team) {
             browserHistory.push(`/${team.name}`);