Sounds pretty solid to me honestly.

I never thought about bending the mechanics around the 30 day window to recover accounts.
Seems like the way to go.