login/logout is working now
fix merge problems