diff --git a/nerdlets/github-about/main.js b/nerdlets/github-about/main.js
index f9a58fe..1dd6f65 100644
--- a/nerdlets/github-about/main.js
+++ b/nerdlets/github-about/main.js
@@ -227,6 +227,7 @@ export default class GithubAbout extends React.PureComponent {
   }
 
   async _deleteUserToken() {
+    await this._deleteGithubUrl();
     const mutation = {
       actionType: UserSecretsMutation.ACTION_TYPE.DELETE_SECRET,
       name: 'GH_TOKEN'
@@ -237,6 +238,7 @@ export default class GithubAbout extends React.PureComponent {
 
   async _setRepo(repoUrl) {
     repoUrl = formatGithubUrl(repoUrl);
+    await this._deleteUserToken();
     const { entityGuid } = this.props.nerdletUrlState;
     const mutation = {
       actionType: EntityStorageMutation.ACTION_TYPE.WRITE_DOCUMENT,
diff --git a/nerdlets/github-about/setup.js b/nerdlets/github-about/setup.js
index 87750b0..2c6f7b1 100644
--- a/nerdlets/github-about/setup.js
+++ b/nerdlets/github-about/setup.js
@@ -1,7 +1,17 @@
 /* eslint-disable react/no-did-update-set-state */
 import React from 'react';
 import PropTypes from 'prop-types';
-import { TextField, Button, Stack, StackItem, Grid, GridItem } from 'nr1';
+import {
+  TextField,
+  Button,
+  Stack,
+  StackItem,
+  Grid,
+  GridItem,
+  Tooltip,
+  Badge,
+  Icon
+} from 'nr1';
 import isUrl from 'is-url';
 
 const PUBLIC_GITHUB_API = 'https://api.github.com';
@@ -55,7 +65,12 @@ export default class Setup extends React.PureComponent {
 
   handleSetGithubUrl() {
     const { githubUrl } = this.state;
-    const { setGithubUrl, setActiveTab } = this.props;
+    const {
+      setGithubUrl,
+      setActiveTab,
+      deleteUserToken,
+      userToken
+    } = this.props;
     if (githubUrl === '') {
       return;
     }
@@ -64,6 +79,10 @@ export default class Setup extends React.PureComponent {
       this.setState({ isValidUrl: false });
       return;
     }
+    if (userToken) {
+      deleteUserToken();
+      return;
+    }
     this.setState({
       isValidUrl: true
     });
@@ -239,6 +258,16 @@ export default class Setup extends React.PureComponent {
                 )}
               </StackItem>
               <StackItem>
+                <Tooltip
+                  text="Setting this will delete any Personal Access Token stored for this Entity for Security purposes"
+                  placementType={Tooltip.PLACEMENT_TYPE.BOTTOM}
+                >
+                  <Badge type={Badge.TYPE.CRITICAL}>
+                    <Icon
+                      type={Icon.TYPE.INTERFACE__SIGN__EXCLAMATION__V_ALTERNATE}
+                    />
+                  </Badge>
+                </Tooltip>
                 <Button
                   onClick={this.handleSetGithubUrl}
                   disabled={!isGithubEnterprise || !githubUrl}
diff --git a/package-lock.json b/package-lock.json
index 0c8ec0a..9d95a99 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,7 +5,7 @@
   "requires": true,
   "packages": {
     "": {
-      "version": "0.6.7",
+      "version": "0.6.9",
       "dependencies": {
         "@newrelic/nr1-community": "^1.3.0-alpha.5",
         "humanize-duration": "^3.23.1",
@@ -4954,7 +4954,182 @@
         "treeverse",
         "validate-npm-package-name",
         "which",
-        "write-file-atomic"
+        "write-file-atomic",
+        "@npmcli/disparity-colors",
+        "@npmcli/git",
+        "@npmcli/installed-package-contents",
+        "@npmcli/map-workspaces",
+        "@npmcli/metavuln-calculator",
+        "@npmcli/move-file",
+        "@npmcli/name-from-folder",
+        "@npmcli/node-gyp",
+        "@npmcli/promise-spawn",
+        "@tootallnate/once",
+        "agent-base",
+        "agentkeepalive",
+        "aggregate-error",
+        "ajv",
+        "ansi-regex",
+        "ansi-styles",
+        "aproba",
+        "are-we-there-yet",
+        "asap",
+        "asn1",
+        "assert-plus",
+        "asynckit",
+        "aws-sign2",
+        "aws4",
+        "balanced-match",
+        "bcrypt-pbkdf",
+        "bin-links",
+        "binary-extensions",
+        "brace-expansion",
+        "builtins",
+        "caseless",
+        "cidr-regex",
+        "clean-stack",
+        "clone",
+        "cmd-shim",
+        "code-point-at",
+        "color-convert",
+        "color-name",
+        "colors",
+        "combined-stream",
+        "common-ancestor-path",
+        "concat-map",
+        "console-control-strings",
+        "core-util-is",
+        "dashdash",
+        "debug",
+        "debuglog",
+        "defaults",
+        "delayed-stream",
+        "delegates",
+        "depd",
+        "dezalgo",
+        "diff",
+        "ecc-jsbn",
+        "emoji-regex",
+        "encoding",
+        "env-paths",
+        "err-code",
+        "extend",
+        "extsprintf",
+        "fast-deep-equal",
+        "fast-json-stable-stringify",
+        "forever-agent",
+        "form-data",
+        "fs-minipass",
+        "fs.realpath",
+        "function-bind",
+        "gauge",
+        "getpass",
+        "har-schema",
+        "har-validator",
+        "has",
+        "has-flag",
+        "has-unicode",
+        "http-cache-semantics",
+        "http-proxy-agent",
+        "http-signature",
+        "https-proxy-agent",
+        "humanize-ms",
+        "iconv-lite",
+        "ignore-walk",
+        "imurmurhash",
+        "indent-string",
+        "infer-owner",
+        "inflight",
+        "inherits",
+        "ip",
+        "ip-regex",
+        "is-core-module",
+        "is-fullwidth-code-point",
+        "is-lambda",
+        "is-typedarray",
+        "isarray",
+        "isexe",
+        "isstream",
+        "jsbn",
+        "json-schema",
+        "json-schema-traverse",
+        "json-stringify-nice",
+        "json-stringify-safe",
+        "jsonparse",
+        "jsprim",
+        "just-diff",
+        "just-diff-apply",
+        "lru-cache",
+        "mime-db",
+        "mime-types",
+        "minimatch",
+        "minipass-collect",
+        "minipass-fetch",
+        "minipass-flush",
+        "minipass-json-stream",
+        "minipass-sized",
+        "minizlib",
+        "mute-stream",
+        "normalize-package-data",
+        "npm-bundled",
+        "npm-install-checks",
+        "npm-normalize-package-bin",
+        "npm-packlist",
+        "number-is-nan",
+        "oauth-sign",
+        "object-assign",
+        "once",
+        "p-map",
+        "path-is-absolute",
+        "path-parse",
+        "performance-now",
+        "proc-log",
+        "process-nextick-args",
+        "promise-all-reject-late",
+        "promise-call-limit",
+        "promise-inflight",
+        "promise-retry",
+        "promzard",
+        "psl",
+        "punycode",
+        "qs",
+        "read-cmd-shim",
+        "readable-stream",
+        "request",
+        "resolve",
+        "retry",
+        "safe-buffer",
+        "safer-buffer",
+        "set-blocking",
+        "signal-exit",
+        "smart-buffer",
+        "socks",
+        "socks-proxy-agent",
+        "spdx-correct",
+        "spdx-exceptions",
+        "spdx-expression-parse",
+        "spdx-license-ids",
+        "sshpk",
+        "string_decoder",
+        "string-width",
+        "stringify-package",
+        "strip-ansi",
+        "supports-color",
+        "tunnel-agent",
+        "tweetnacl",
+        "typedarray-to-buffer",
+        "unique-filename",
+        "unique-slug",
+        "uri-js",
+        "util-deprecate",
+        "uuid",
+        "validate-npm-package-license",
+        "verror",
+        "walk-up-path",
+        "wcwidth",
+        "wide-align",
+        "wrappy",
+        "yallist"
       ],
       "dev": true,
       "peer": true,