first updates for back-merging user_sql and user_ldap