Fix of NPE, account deletion, again. this should hopefully be final version 2.0