Lockout stuff

Save locked state for lockouts
Don't use the current time as reset time for expired lockouts