code review update + Java1/Java2 proper registration/login handling