diff --git a/src/Settings.tsx b/src/Settings.tsx
index e63f55e..589fd8a 100644
--- a/src/Settings.tsx
+++ b/src/Settings.tsx
@@ -36,7 +36,7 @@ export default function Settings() {
       account: values['docker-account'],
       password: values['docker-password'],
     });
-    notification.info({
+    notification.success({
       message: 'DockerHub setup saved.',
     });
   };
@@ -46,7 +46,7 @@ export default function Settings() {
       secretKey: values['aws-key'],
       region: values['aws-region'],
     });
-    notification.info({
+    notification.success({
       message: 'AWS setup saved.',
     });
   };
@@ -55,7 +55,7 @@ export default function Settings() {
       endpoint: values['primehub-api-endpoint'],
       token: values['primehub-api-token'],
     });
-    notification.info({
+    notification.success({
       message: 'PrimeHub setup saved.',
     });
   };
@@ -100,6 +100,48 @@ export default function Settings() {
       });
     }
   };
+  const onAWSTest = async () => {
+    const accessKeyId = awsForm.getFieldValue('aws-id');
+    const secretAccessKey = awsForm.getFieldValue('aws-key');
+    const region = awsForm.getFieldValue('aws-region');
+    const result = await send('test-aws-credentials', {
+      accessKeyId,
+      secretAccessKey,
+      region,
+    });
+    if (result.error) {
+      console.log(result.error);
+      notification.error({
+        message: 'AWS Credential Check Failed',
+        description: ``,
+      });
+    } else {
+      notification.success({
+        message: 'AWS Connected',
+        description: ``,
+      });
+    }
+  };
+  const onDockerHubTest = async () => {
+    const username = dockerHubForm.getFieldValue('docker-account');
+    const password = dockerHubForm.getFieldValue('docker-password');
+    const result = await send('test-dockerhub-credentials', {
+      username,
+      password,
+    });
+    if (!result) {
+      console.log(result.error);
+      notification.error({
+        message: 'DockerHub Credential Check Failed',
+        description: ``,
+      });
+    } else {
+      notification.success({
+        message: 'DockerHub Connected',
+        description: ``,
+      });
+    }
+  };
   const onDockerHubReset = async () => {
     await send('delete-dockerhub-credential');
     notification.info({
@@ -207,7 +249,13 @@ export default function Settings() {
                 <Input />
               </Form.Item>
               <Form.Item label='Password' name='docker-password'>
-                <Input.Password />
+                <Input.Password
+                  addonAfter={
+                    <Button type='text' onClick={onDockerHubTest}>
+                      Test
+                    </Button>
+                  }
+                />
               </Form.Item>
               <Form.Item style={{ textAlign: 'right' }}>
                 <Button type='primary' htmlType='submit'>
@@ -271,7 +319,13 @@ export default function Settings() {
                 <Input />
               </Form.Item>
               <Form.Item label='Secret Access Key' name='aws-key'>
-                <Input.Password />
+                <Input.Password
+                  addonAfter={
+                    <Button type='text' onClick={onAWSTest}>
+                      Test
+                    </Button>
+                  }
+                />
               </Form.Item>
               <Form.Item style={{ textAlign: 'right' }}>
                 <Button type='primary' htmlType='submit'>
diff --git a/src/electron/AwsAdapter.ts b/src/electron/AwsAdapter.ts
index 0fccfaf..7e6043c 100644
--- a/src/electron/AwsAdapter.ts
+++ b/src/electron/AwsAdapter.ts
@@ -1,4 +1,5 @@
 import * as AWS from 'aws-sdk';
+
 interface AwsAdapterConfig {
   accessKey: string;
   secretKey: string;
@@ -42,6 +43,20 @@ export default class AwsAdapter {
     return AwsAdapter.instance;
   }
 
+  public static async verifyCredentials(
+    accessKeyId: string,
+    secretAccessKey: string,
+    region: string
+  ): Promise<AWS.STS.GetCallerIdentityResponse> {
+    return await new AWS.STS({
+      accessKeyId,
+      secretAccessKey,
+      region,
+    })
+      .getCallerIdentity()
+      .promise();
+  }
+
   public async verifyAccessPermission(): Promise<AWS.STS.GetCallerIdentityResponse> {
     return await this.sts.getCallerIdentity().promise();
   }
diff --git a/src/electron/DockerHubAdapter.ts b/src/electron/DockerHubAdapter.ts
index 8f05954..3721a34 100644
--- a/src/electron/DockerHubAdapter.ts
+++ b/src/electron/DockerHubAdapter.ts
@@ -63,6 +63,19 @@ export default class DockerHubAdapter {
     return DockerHubAdapter.instance;
   }
 
+  public static async verifyCredentials(
+    username: string,
+    password: string
+  ): Promise<boolean> {
+    const loginUrl = `${API_URL}/users/login`;
+    const response = await axios.post(loginUrl, { username, password });
+    const token = get(response, 'data.token', null);
+    if (token) {
+      return true;
+    }
+    return false;
+  }
+
   public async login(): Promise<void> {
     const loginUrl = `${API_URL}/users/login`;
     const response = await axios.post(loginUrl, this.credential);
diff --git a/src/electron/ServerHandlers.ts b/src/electron/ServerHandlers.ts
index b085c7a..b5f162d 100644
--- a/src/electron/ServerHandlers.ts
+++ b/src/electron/ServerHandlers.ts
@@ -14,7 +14,6 @@ Sentry.init({
   dsn: 'https://6ad1a0b7db2247719c690f7d373b4bfc@o1081482.ingest.sentry.io/6088888',
 });
 
-
 const docker = new Docker();
 const dockerHubCredentialKeyName = 'Crane-DockerHub';
 const primeHubCredentialKeyName = 'Crane-PrimeHub';
@@ -180,6 +179,28 @@ const handlers = {
       console.log(error);
     }
   },
+  'test-aws-credentials': async (args) => {
+    try {
+      return await AwsAdapter.verifyCredentials(
+        args.accessKeyId,
+        args.secretAccessKey,
+        args.region
+      );
+    } catch (error) {
+      return { error };
+    }
+  },
+  'test-dockerhub-credentials': async (args) => {
+    try {
+      return await DockerHubAdapter.verifyCredentials(
+        args.username,
+        args.password
+      );
+    } catch (error) {
+      console.log(error);
+      return false;
+    }
+  },
   'save-primehub-credential': async (args) =>
     await saveCredential(primeHubCredentialKeyName, args.endpoint, args.token),
   'save-aws-credential': async (args) => {