more fixes in form-field and signin