Merge #50: Move email credentials into CredentialsStore, update schema