Password recovery fix and layout