diff --git a/frontend/src/ManageOrgUsers/ManageOrgUsers.jsx b/frontend/src/ManageOrgUsers/ManageOrgUsers.jsx
index 7e66af89fb..d60417a77c 100644
--- a/frontend/src/ManageOrgUsers/ManageOrgUsers.jsx
+++ b/frontend/src/ManageOrgUsers/ManageOrgUsers.jsx
@@ -290,7 +290,9 @@ class ManageOrgUsers extends React.Component {
                   <div
                     className="card-table fixedHeader table-responsive table-bordered"
                     ref={this.tableRef}
-                    style={{ maxHeight: this.tableRef.current && this.calculateOffset() }}
+                    style={{
+                      maxHeight: this.tableRef.current && this.calculateOffset(),
+                    }}
                   >
                     <table data-testid="usersTable" className="table table-vcenter" disabled={true}>
                       <thead>
@@ -383,7 +385,13 @@ class ManageOrgUsers extends React.Component {
                                 )}
                               </td>
                               <td>
-                                <a
+                                <button
+                                  type="button"
+                                  style={{ minWidth: '100px' }}
+                                  className={`btn btn-sm btn-${user.status === 'archived' ? 'success' : 'danger'} ${
+                                    unarchivingUser === user.id || archivingUser === user.id ? 'btn-loading' : ''
+                                  }`}
+                                  disabled={unarchivingUser === user.id || archivingUser === user.id}
                                   onClick={() => {
                                     user.status === 'archived'
                                       ? this.unarchiveOrgUser(user.id)
@@ -391,9 +399,7 @@ class ManageOrgUsers extends React.Component {
                                   }}
                                 >
                                   {user.status === 'archived' ? 'Unarchive' : 'Archive'}
-
-                                  {unarchivingUser === user.id || archivingUser === user.id ? '...' : ''}
-                                </a>
+                                </button>
                               </td>
                             </tr>
                           ))}