Dev accounts creation fixes

@Dantemss to review and merge