Feature/en 1914

Alternatively you could write "if password is not None" - I think this flow is easier to read