diff --git a/xrdp/lang.c b/xrdp/lang.c
index 998c6d94..0623b91e 100644
--- a/xrdp/lang.c
+++ b/xrdp/lang.c
@@ -209,6 +209,11 @@ get_keymaps(int keylayout, struct xrdp_keymap* keymap)
   filename = (char*)g_malloc(256, 0);
   /* check if there is a keymap file */
   g_snprintf(filename, 255, "%s/km-%4.4x.ini", XRDP_CFG_PATH, keylayout);
+  /* if the file does not exist, try again with 'en-us' as fallback */
+  if (!g_file_exist(filename))
+  {
+    g_snprintf(filename, 255, "%s/km-0409.ini", XRDP_CFG_PATH);
+  }
   if (g_file_exist(filename))
   {
     fd = g_file_open(filename);
diff --git a/xrdp/xrdp_listen.c b/xrdp/xrdp_listen.c
index c5746281..80aa64d3 100644
--- a/xrdp/xrdp_listen.c
+++ b/xrdp/xrdp_listen.c
@@ -225,7 +225,7 @@ xrdp_listen_main_loop(struct xrdp_listen* self)
     self->status = -1;
     return 1;
   }
-  error = trans_listen_address(self->listen_trans, port,address);
+  error = trans_listen_address(self->listen_trans, port, address);
   if (error == 0)
   {
     self->listen_trans->trans_conn_in = xrdp_listen_conn_in;