Lockout time reset
Update
Merged App.php