Provision after key checking
Merge pull request #1264 from psav/fix_setup_sh

Provision after key checking