#275 Clouseau detangle user form

Pull request for https://github.com/backdrop/backdrop-issues/issues/275