fixed problems due to login/index change