Fix issue #653 (Passwords preprended during upgrade)

Fix for : #653 
Sometimes passwords encrypted with old process already have a salt key !

Tested from 2.1.7 to 2.1.21 + this patch = passwords ok.