Revert "Revert "Merge branch 'login' into prog""

This reverts commit 49c59594266a7ff345a57ae3c6b7b68a181daf14.