added login safety and animation