Fixed badge count when consolidated notifications enabled

Also emphsized password reset notice
Really minor UI wording change