Did #63 and working towards #49
Fixed login redirect some more