finished password reminding
merge
merge tests