diff --git a/eekboard/eekboard-context-service.c b/eekboard/eekboard-context-service.c
index e9f7b9db..f74382be 100644
--- a/eekboard/eekboard-context-service.c
+++ b/eekboard/eekboard-context-service.c
@@ -316,9 +316,14 @@ EekboardContextService *eekboard_context_service_new(void)
 {
     return g_object_new (EEKBOARD_TYPE_CONTEXT_SERVICE, NULL);
 }
+
 void eekboard_context_service_set_submission(EekboardContextService *context, struct submission *submission) {
     context->priv->submission = submission;
     if (context->priv->submission) {
         submission_set_keyboard(context->priv->submission, context->priv->keyboard);
     }
 }
+
+void eekboard_context_service_set_ui(EekboardContextService *context, ServerContextService *ui) {
+    context->priv->ui = ui;
+}
diff --git a/eekboard/eekboard-context-service.h b/eekboard/eekboard-context-service.h
index 383a6579..9cb53345 100644
--- a/eekboard/eekboard-context-service.h
+++ b/eekboard/eekboard-context-service.h
@@ -87,6 +87,7 @@ GType         eekboard_context_service_get_type
                                               (void) G_GNUC_CONST;
 EekboardContextService *eekboard_context_service_new(void);
 void eekboard_context_service_set_submission(EekboardContextService *context, struct submission *submission);
+void eekboard_context_service_set_ui(EekboardContextService *context, ServerContextService *ui);
 void          eekboard_context_service_destroy (EekboardContextService *context);
 LevelKeyboard *eekboard_context_service_get_keyboard(EekboardContextService *context);
 
diff --git a/src/data.rs b/src/data.rs
index c190e54f..5b2c4c9d 100644
--- a/src/data.rs
+++ b/src/data.rs
@@ -201,7 +201,10 @@ fn load_layout_data_with_fallback(
                     source, e
                 ),
             },
-            Ok(layout) => return (kind, layout),
+            Ok(layout) => {
+                log_print!(logging::Level::Info, "Loaded layout {}", source);
+                return (kind, layout);
+            }
         }
     }
 
diff --git a/src/server-main.c b/src/server-main.c
index 9cf88eed..68a5f06a 100644
--- a/src/server-main.c
+++ b/src/server-main.c
@@ -288,6 +288,7 @@ main (int argc, char **argv)
     if (instance.dbus_handler) {
         dbus_handler_set_ui_context(instance.dbus_handler, instance.ui_context);
     }
+    eekboard_context_service_set_ui(instance.settings_context, instance.ui_context);
 
     session_register();