Fixed modal popping up when logging out sometimes
Merge branch 'master' into production