Merge pull request #624 from talkingwithsean/develop

Crypt isn't set and it causes extensive script time when specifying a cus