Fix: Weird accounts entry behaviour
Fix the fix