Correct some notice (refs #3410)
Merge pull request #650 from cbonnissent/3.2_3410

Correct some notice
Merge pull request #652 from eguaj/3.2-A1839

Do not store redirect uri in session (closes #1839)
Cleaned-up useless if() (refs #1839)