Potato login fixes and improvements