diff --git a/ui/src/app/dashboard/view/Dashboard.js b/ui/src/app/dashboard/view/Dashboard.js
index d7892f028..b296fefc0 100644
--- a/ui/src/app/dashboard/view/Dashboard.js
+++ b/ui/src/app/dashboard/view/Dashboard.js
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import Nav from 'react-bootstrap/Nav';
-import { Switch, Route, Redirect, useRouteMatch } from 'react-router-dom';
+import { Switch, Route, Redirect, useRouteMatch, useLocation } from 'react-router-dom';
 import { NavLink } from 'react-router-dom';
 
 import Translate from '../../i18n/components/translate';
@@ -19,6 +19,7 @@ import { useNonAdminSources } from '../../metadata/hooks/api';
 export function Dashboard () {
 
     const { path } = useRouteMatch();
+    const location = useLocation();
 
     const isAdmin = useIsAdmin();
 
@@ -50,7 +51,7 @@ export function Dashboard () {
     React.useEffect(() => {
         loadSources();
         loadUsers();
-    }, []);
+    }, [location]);
 
     React.useEffect(() => {
         setActions(users.length + sources.length);
diff --git a/ui/src/app/metadata/domain/source/component/SourceList.js b/ui/src/app/metadata/domain/source/component/SourceList.js
index 792c16394..41ce7f0cd 100644
--- a/ui/src/app/metadata/domain/source/component/SourceList.js
+++ b/ui/src/app/metadata/domain/source/component/SourceList.js
@@ -39,42 +39,42 @@ export default function SourceList({ entities, onDelete, onEnable, onChangeGroup
                             </tr>
                         </thead>
                         <tbody>
-                            {limited.map((source, idx) =>
-                                <tr key={idx}>
-                                    <td className="align-middle">
-                                        <Link to={`/metadata/source/${source.id}/configuration/options`}>{source.serviceProviderName}</Link>
-                                    </td>
-                                    <td className="align-middle">
-                                        {source.entityId}
-                                    </td>
-                                    <td className="align-middle">
-                                        {source.createdBy}
-                                    </td>
-                                    <td className="align-middle"><FormattedDate date={source.createdDate} /></td>
-                                    <td className="text-center align-middle">
-                                        <span className="d-flex justify-content-center align-items-center">
-                                        {onEnable && canEnable ?
-                                            <Form.Check
-                                                type="switch"
-                                                id={`enable-switch-${source.id}`}
-                                                size="lg"
-                                                aria-label={translator(source.serviceEnabled ? 'label.disable' : 'label.enable')}
-                                                onChange={({ target: { checked } }) => onEnable(source, checked)}
-                                                checked={source.serviceEnabled}
-                                            >
-                                            </Form.Check>
-                                            :
-                                            <Badge variant={source.serviceEnabled ? 'success' : 'danger'}>
-                                                <Translate value={source.serviceEnabled ? 'value.enabled' : 'value.disabled'}></Translate>
-                                            </Badge>
-                                        }
-                                        </span>
-                                    </td>
-                                    {isAdmin && onChangeGroup &&
-                                    <td className="align-middle">
-                                        <GroupsProvider>
-                                            {(groups, removeGroup, loadingGroups) =>
-                                                <React.Fragment>
+                            <GroupsProvider>
+                                {(groups, removeGroup, loadingGroups) =>
+                                    <React.Fragment>
+                                        {limited.map((source, idx) =>
+                                        <tr key={idx}>
+                                            <td className="align-middle">
+                                                <Link to={`/metadata/source/${source.id}/configuration/options`}>{source.serviceProviderName}</Link>
+                                            </td>
+                                            <td className="align-middle">
+                                                {source.entityId}
+                                            </td>
+                                            <td className="align-middle">
+                                                {source.createdBy}
+                                            </td>
+                                            <td className="align-middle"><FormattedDate date={source.createdDate} /></td>
+                                            <td className="text-center align-middle">
+                                                <span className="d-flex justify-content-center align-items-center">
+                                                {onEnable && canEnable ?
+                                                    <Form.Check
+                                                        type="switch"
+                                                        id={`enable-switch-${source.id}`}
+                                                        size="lg"
+                                                        aria-label={translator(source.serviceEnabled ? 'label.disable' : 'label.enable')}
+                                                        onChange={({ target: { checked } }) => onEnable(source, checked)}
+                                                        checked={source.serviceEnabled}
+                                                    >
+                                                    </Form.Check>
+                                                    :
+                                                    <Badge variant={source.serviceEnabled ? 'success' : 'danger'}>
+                                                        <Translate value={source.serviceEnabled ? 'value.enabled' : 'value.disabled'}></Translate>
+                                                    </Badge>
+                                                }
+                                                </span>
+                                            </td>
+                                            {isAdmin && onChangeGroup &&
+                                                <td className="align-middle">
                                                     <label htmlFor={`group-${source.serviceProviderName}`} className="sr-only"><Translate value="action.source-group">Group</Translate></label>
                                                     <select
                                                         id={`group-${source.id}`}
@@ -89,32 +89,33 @@ export default function SourceList({ entities, onDelete, onEnable, onChangeGroup
                                                             <option key={ridx} value={g.resourceId}>{g.name}</option>
                                                         ))}
                                                     </select>
-                                                </React.Fragment>
+                                                </td>
                                             }
-                                        </GroupsProvider>
-                                    </td>
-                                    }
-                                    {onDelete && isAdmin &&
-                                    <td className="text-right align-middle">
-                                        <OverlayTrigger trigger={source.serviceEnabled ? ['hover', 'focus'] : []} placement="left"
-                                            overlay={
-                                                <Popover id={`delete-source-btn-${idx}`}>
-                                                    <Popover.Content>A metadata source must be disabled before it can be deleted.</Popover.Content>
-                                                </Popover>
-                                            }>
-                                            <span className="d-inline-block">
-                                                <Button variant="danger" size="sm"
-                                                    type="button"
-                                                    disabled={source.serviceEnabled}
-                                                    onClick={() => onDelete(source.id, onDelete)}>
-                                                    <span className="sr-only">Delete</span>
-                                                    <FontAwesomeIcon icon={faTrash} />
-                                                </Button>
-                                            </span>
-                                        </OverlayTrigger>
-                                    </td>}
-                                </tr>
-                            )}
+                                            {onDelete && isAdmin &&
+                                                <td className="text-right align-middle">
+                                                    <OverlayTrigger trigger={source.serviceEnabled ? ['hover', 'focus'] : []} placement="left"
+                                                        overlay={
+                                                            <Popover id={`delete-source-btn-${idx}`}>
+                                                                <Popover.Content>A metadata source must be disabled before it can be deleted.</Popover.Content>
+                                                            </Popover>
+                                                        }>
+                                                        <span className="d-inline-block">
+                                                            <Button variant="danger" size="sm"
+                                                                type="button"
+                                                                disabled={source.serviceEnabled}
+                                                                onClick={() => onDelete(source.id, onDelete)}>
+                                                                <span className="sr-only">Delete</span>
+                                                                <FontAwesomeIcon icon={faTrash} />
+                                                            </Button>
+                                                        </span>
+                                                    </OverlayTrigger>
+                                                </td>
+                                                }
+                                        </tr>
+                                        )}
+                                    </React.Fragment>
+                                }
+                            </GroupsProvider>
                         </tbody>
                     </table>
                 </div>