Fix for initial account