diff --git a/src/components/registration/steps.jsx b/src/components/registration/steps.jsx
index 59785f164..216cb7e5f 100644
--- a/src/components/registration/steps.jsx
+++ b/src/components/registration/steps.jsx
@@ -763,15 +763,9 @@ module.exports = {
             return {
                 email: null,
                 invited: false,
-                confirmed: false,
-                educator: true
+                confirmed: false
             };
         },
-        componentWillReceiveProps: function (nextProps) {
-            if (nextProps.educator && nextProps.confirmed) {
-                window.location.href = '/educators/classes/';
-            }
-        },
         render: function () {
             return (
                 <Slide className="registration-step last-step">
diff --git a/src/views/teacherwaitingroom/teacherwaitingroom.jsx b/src/views/teacherwaitingroom/teacherwaitingroom.jsx
index fd1872b47..5770f55b3 100644
--- a/src/views/teacherwaitingroom/teacherwaitingroom.jsx
+++ b/src/views/teacherwaitingroom/teacherwaitingroom.jsx
@@ -10,6 +10,11 @@ require('./teacherwaitingroom.scss');
 
 var TeacherWaitingRoom = React.createClass({
     displayName: 'TeacherWaitingRoom',
+    componentWillReceiveProps: function (nextProps) {
+        if (nextProps.session.permissions.educator && nextProps.session.permissions.social) {
+            window.location.href = '/educators/classes/';
+        }
+    },
     render: function () {
         var permissions = this.props.session.permissions || {};
         var user = this.props.session.user || {};