UC-136 fixing the facebook login form and code cleanup