Moved the refreshing of the current user into the Form category