Fix a pesky issue with email passwords