diff --git a/mo/web/main.py b/mo/web/main.py
index c05c0ad767f4688ec578a5bd201b5e108b6a9462..6560fc5d8222d56f6107a3eeda2817ecee8c496f 100644
--- a/mo/web/main.py
+++ b/mo/web/main.py
@@ -57,7 +57,13 @@ def login():
         mo.users.login(user)
         db.get_session().commit()
         session['uid'] = user.user_id
-        return redirect(form.next.data or url_for('index'))
+        url = form.next.data
+        if not url:
+            if user.is_admin or user.is_org:
+                url = url_for('org_index')
+            else:
+                url = url_for('index')
+        return redirect(url)
 
     return render_template('login.html', form=form, error=error)
 
diff --git a/mo/web/org.py b/mo/web/org.py
index c5973edab453eeb9cb2a7eba975362c614558da1..5c811f78d2956c3b911096e49839cafcf29882f4 100644
--- a/mo/web/org.py
+++ b/mo/web/org.py
@@ -2,7 +2,6 @@ from flask import render_template, g, redirect, url_for, request
 from sqlalchemy.orm import aliased
 
 import mo.db as db
-import mo.rights
 from mo.web.table import Table, Column
 from mo.web import app