Test merge
Implemented encryption method list to disable password field if specific method is not chosen