diff --git a/ui/src/containers/ClientForm/index.js b/ui/src/containers/ClientForm/index.js
index 1e689eb693..0484b56896 100644
--- a/ui/src/containers/ClientForm/index.js
+++ b/ui/src/containers/ClientForm/index.js
@@ -6,7 +6,7 @@ import { map } from 'lodash';
 import btoa from 'btoa';
 import Checkbox from 'ui/components/Material/Checkbox';
 import Dropdown from 'ui/components/Material/Dropdown';
-import { withSchema, withModel } from 'ui/utils/hocs';
+import { withModels, withModel } from 'ui/utils/hocs';
 import { API_SCOPES, XAPI_SCOPES } from 'lib/constants/scopes';
 import ValidationList from 'ui/components/ValidationList';
 import AuthorityEditor from './AuthorityEditor';
@@ -22,7 +22,11 @@ const renderStoreItems = stores =>
   ));
 
 const renderStoreDropdown = compose(
-  withSchema('lrs')
+  withProps({
+    schema: 'lrs',
+    first: 100
+  }),
+  withModels
 )(({ models, onSelect, selectedId, elemId }) =>
   <Dropdown
     label="LRS (optional)"
diff --git a/worker/src/handlers/statement/statementForwarding/statementForwardingRequestHandler.js b/worker/src/handlers/statement/statementForwarding/statementForwardingRequestHandler.js
index b6b2ed4d34..f3b1c9d28f 100644
--- a/worker/src/handlers/statement/statementForwarding/statementForwardingRequestHandler.js
+++ b/worker/src/handlers/statement/statementForwarding/statementForwardingRequestHandler.js
@@ -154,7 +154,7 @@ const statementForwardingRequestHandler = async (
           return;
         });
       } else {
-        logger.info(`SENT statement ${updatedStatement._id} to ${STATEMENT_FORWARDING_REQUEST_DELAYED_QUEUE}`);
+        logger.info(`EXCEEDED max retry for statement ${updatedStatement._id}, failing (should go to dead letter queue).`);
         done(err); // failed, let redrive send to dead letter queue
       }
     } catch (err) {