#34 Attempt to fix short login bug