fixes to use case without password history and activations