diff --git a/plugins/splunk-on-call/src/components/Errors/MissingTokenError.tsx b/plugins/splunk-on-call/src/components/Errors/MissingApiKeyOrApiIdError.tsx
similarity index 80%
rename from plugins/splunk-on-call/src/components/Errors/MissingTokenError.tsx
rename to plugins/splunk-on-call/src/components/Errors/MissingApiKeyOrApiIdError.tsx
index 221ab780e7..ea72b6ca51 100644
--- a/plugins/splunk-on-call/src/components/Errors/MissingTokenError.tsx
+++ b/plugins/splunk-on-call/src/components/Errors/MissingApiKeyOrApiIdError.tsx
@@ -17,11 +17,11 @@ import React from 'react';
 import { EmptyState } from '@backstage/core';
 import { Button } from '@material-ui/core';
 
-export const MissingTokenError = () => (
+export const MissingApiKeyOrApiIdError = () => (
   <EmptyState
     missing="info"
-    title="Missing or invalid SplunkOnCall Token"
-    description="The request to fetch data needs a valid token. See README for more details."
+    title="Missing or invalid Splunk On-Call API key and/or API id"
+    description="The request to fetch data needs a valid api id and a valid api key. See README for more details."
     action={
       <Button
         color="primary"
diff --git a/plugins/splunk-on-call/src/components/Errors/index.ts b/plugins/splunk-on-call/src/components/Errors/index.ts
index 3c2dfa65f2..9698b0bd14 100644
--- a/plugins/splunk-on-call/src/components/Errors/index.ts
+++ b/plugins/splunk-on-call/src/components/Errors/index.ts
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { MissingTokenError } from './MissingTokenError';
+export { MissingApiKeyOrApiIdError } from './MissingApiKeyOrApiIdError';
diff --git a/plugins/splunk-on-call/src/components/Incident/Incidents.test.tsx b/plugins/splunk-on-call/src/components/Incident/Incidents.test.tsx
index 8ca546c31e..d1f973735c 100644
--- a/plugins/splunk-on-call/src/components/Incident/Incidents.test.tsx
+++ b/plugins/splunk-on-call/src/components/Incident/Incidents.test.tsx
@@ -93,7 +93,7 @@ describe('Incidents', () => {
       }),
     ).toBeInTheDocument();
     expect(getByText('test-incident')).toBeInTheDocument();
-    expect(getByTitle('ACKED')).toBeInTheDocument();
+    expect(getByTitle('Acknowledged')).toBeInTheDocument();
     expect(getByLabelText('Status warning')).toBeInTheDocument();
 
     // assert links, mailto and hrefs, date calculation
diff --git a/plugins/splunk-on-call/src/components/SplunkOnCallCard.test.tsx b/plugins/splunk-on-call/src/components/SplunkOnCallCard.test.tsx
index 018c18f37d..8a4f2464cb 100644
--- a/plugins/splunk-on-call/src/components/SplunkOnCallCard.test.tsx
+++ b/plugins/splunk-on-call/src/components/SplunkOnCallCard.test.tsx
@@ -22,6 +22,9 @@ import {
   alertApiRef,
   ApiProvider,
   ApiRegistry,
+  ConfigApi,
+  configApiRef,
+  ConfigReader,
   createApiRef,
 } from '@backstage/core';
 import {
@@ -43,8 +46,15 @@ const mockSplunkOnCallApi: Partial<SplunkOnCallClient> = {
   getTeams: async () => [MOCK_TEAM],
 };
 
+const configApi: ConfigApi = new ConfigReader({
+  splunkOnCall: {
+    username: MOCKED_USER.username,
+  },
+});
+
 const apis = ApiRegistry.from([
   [splunkOnCallApiRef, mockSplunkOnCallApi],
+  [configApiRef, configApi],
   [
     alertApiRef,
     createApiRef({
@@ -64,7 +74,7 @@ const entity: Entity = {
   },
 };
 
-describe('PageDutyCard', () => {
+describe('SplunkOnCallCard', () => {
   it('Render splunkoncall', async () => {
     mockSplunkOnCallApi.getUsers = jest
       .fn()
@@ -97,7 +107,7 @@ describe('PageDutyCard', () => {
     );
     await waitFor(() => !queryByTestId('progress'));
     expect(
-      getByText('Missing or invalid SplunkOnCall Token'),
+      getByText('Missing or invalid Splunk On-Call API key and/or API id'),
     ).toBeInTheDocument();
   });
 
diff --git a/plugins/splunk-on-call/src/components/SplunkOnCallCard.tsx b/plugins/splunk-on-call/src/components/SplunkOnCallCard.tsx
index 63776b6844..6d6d1c71e4 100644
--- a/plugins/splunk-on-call/src/components/SplunkOnCallCard.tsx
+++ b/plugins/splunk-on-call/src/components/SplunkOnCallCard.tsx
@@ -39,7 +39,7 @@ import { Alert } from '@material-ui/lab';
 import { splunkOnCallApiRef, UnauthorizedError } from '../api';
 import AlarmAddIcon from '@material-ui/icons/AlarmAdd';
 import { TriggerDialog } from './TriggerDialog';
-import { MissingTokenError } from './Errors/MissingTokenError';
+import { MissingApiKeyOrApiIdError } from './Errors/MissingApiKeyOrApiIdError';
 import { User } from './types';
 
 const useStyles = makeStyles({
@@ -69,7 +69,7 @@ export const MissingUsername = () => (
     <EmptyState
       title="No Splunk On-Call user available."
       missing="info"
-      description="You need to add a username to your 'app.config.yml' if you want to enable Splunk On-Call."
+      description="You need to add a valid username to your 'app.config.yml' if you want to enable Splunk On-Call."
     />
   </CardContent>
 );
@@ -117,7 +117,7 @@ export const SplunkOnCallCard = ({ entity }: Props) => {
     username && users?.userList.find(user => user.username === username);
 
   if (error instanceof UnauthorizedError) {
-    return <MissingTokenError />;
+    return <MissingApiKeyOrApiIdError />;
   }
 
   if (error) {
@@ -136,7 +136,7 @@ export const SplunkOnCallCard = ({ entity }: Props) => {
     if (!team) {
       return <MissingTeamAnnotation />;
     }
-    if (!username) {
+    if (!username || !incidentCreator) {
       return <MissingUsername />;
     }
 
diff --git a/plugins/splunk-on-call/src/components/TriggerDialog/TriggerDialog.test.tsx b/plugins/splunk-on-call/src/components/TriggerDialog/TriggerDialog.test.tsx
index 16fbe815d0..c5176efefd 100644
--- a/plugins/splunk-on-call/src/components/TriggerDialog/TriggerDialog.test.tsx
+++ b/plugins/splunk-on-call/src/components/TriggerDialog/TriggerDialog.test.tsx
@@ -66,6 +66,7 @@ describe('TriggerDialog', () => {
         <ApiProvider apis={apis}>
           <TriggerDialog
             showDialog
+            incidentCreator={MOCKED_USER}
             handleDialog={() => {}}
             users={[MOCKED_USER]}
             onIncidentCreated={() => {}}
diff --git a/plugins/splunk-on-call/src/plugin.test.ts b/plugins/splunk-on-call/src/plugin.test.ts
index e55229cab8..a64e5474a1 100644
--- a/plugins/splunk-on-call/src/plugin.test.ts
+++ b/plugins/splunk-on-call/src/plugin.test.ts
@@ -15,7 +15,7 @@
  */
 import { plugin } from './plugin';
 
-describe('splunkoncall', () => {
+describe('splunk-on-call', () => {
   it('should export plugin', () => {
     expect(plugin).toBeDefined();
   });