Fix initial LDAP + DB auth bugs

- Fix initial bugs that surfaced when switching from only authenticating
  with LDAP to authenticating with both the database and LDAP