added back / frontend implementation of recover password
merge fix