Hopefully the final fix for new accounts