updated devise login and join