Updated login pages
Fixed email function and tidied up modules