Added some stuff to fix create account (not fixed)