rework on user-defined credentials

Signed-off-by: vagrant <vagrant@precise64.(none)>