Fix/save correctly turn credentials

Merged Ronan requested to merge fix/save-correctly-turn-credentials into master

Merge request reports