Fixing account forms