Move user fields to bottom. #857