Added password match check and subnavi