Fix NPE on account and workspace creation;