[FIX] Rollback file (Previously changed for compatibility issues)
[FIX] Second part of that password-fix-thing by Frank