Updated Form Authentication

Fixes #21 Fixes #18