fix non-devise issues & closed #85