fixed misc issues regarding login/sessions

Signed-off-by: Paul Stone <pmstone247@gmail.com>
resolved merge conflicts on index page