Fix salt and password used in wrong position

fixes #5227