Final logging solution and tweek to only send password email