diff --git a/src/adminview/admin_router.ts b/src/adminview/admin_router.ts
index 4f0ffa6e42f2ae9677b37274d8fe82bb558da357..b75e26b2295bdaee8c3ad72fab2e2f20d21c1ff1 100644
--- a/src/adminview/admin_router.ts
+++ b/src/adminview/admin_router.ts
@@ -241,7 +241,8 @@ router.use((req, res, next) => {
  */
 router.use((err, req, res, next) => {
     console.log("adminview: Entering error handler");
-    console.log(err.message);
+    console.log(err);
+    //console.log(err.message);
 
     //res.status(err.status || 500);
     res.render('error', {
diff --git a/src/app.ts b/src/app.ts
index bf134c5830ea0e23c180c270e725d65bd4cbe7cc..cbe12992e5d4867f8c1197d7356c46f4c64ce391 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -208,8 +208,19 @@ const context = async ({ req }): Promise<Context> => {
             console.log(err);
         }
     }
-    
-    return {
+    console.log(`Constructing context with uid = ${uid}`);
+    /*return {
+        request: req,
+        user: { uid: uid },
+        models: {
+            auth: await AuthorizationModel.create(uid),
+            user: new UserModel(uid),
+            group: new GroupModel(uid),
+            message: new MessageModel(uid),
+            request: new RequestModel(uid)
+        }
+    };*/
+    let blah = {
         request: req,
         user: { uid: uid },
         models: {
@@ -220,6 +231,8 @@ const context = async ({ req }): Promise<Context> => {
             request: new RequestModel(uid)
         }
     };
+    console.log("finished constructing context");
+    return blah;
 };
 
 const server = new ApolloServer({
diff --git a/src/config_passport.js b/src/config_passport.js
index c9b9a859b8e2bd60758e106b4a9a4d08f5d97529..d82f49baa4fc2f2431251bee2c1875960558eb8f 100644
--- a/src/config_passport.js
+++ b/src/config_passport.js
@@ -40,10 +40,11 @@ passport.use(new LdapStrategy({
         url: ldapConfig.server,
         //bindDn: '.............',
         //bindCredentials: '..........',
-        //  searchBase: ldapConfig.searchBase, TODO: this cannot be left empty.
-        //  searchFilter: ldapConfig.searchFilter, TODO: this cannot be left empty.
-        //searchAttributes: ['givenName', 'sn'],
+        searchBase: ldapConfig.dn_users, // this field cannot be left empty.
+        searchFilter: '(uid={{username}})', // this field cannot be left empty.
+        searchAttributes: ['uid', 'urlPhoto'], // only fetch the uid, no need for any other field
         //tlsOptions: '..........',
+        //https://www.npmjs.com/package/passport-ldapauth for more
     },
     //usernameField: 'username', // Field name where the username is found, defaults to username
     //passwordField: 'password', // Field name where the password is found, defaults to password