input validation + step adding hotfix + logout