Adds support for alternative authentication mechanisms (still testing)<br />Fixes a bug with the returnto param.