added condition option into email and passwd valid