Some fixes on account crud