#737 Fix issue with rules
#736 Fix rules page when random password