Remove unneccessary next params and implement login better