Merge branch 'develop'
Redirect newly signed up users to where they originally wanted to go