Added Custom data fields and correct login redirect