diff --git a/frontend-react/src/components/admin/AdminPage.tsx b/frontend-react/src/components/admin/AdminPage.tsx
index 41bbae32f..a99a09ce6 100644
--- a/frontend-react/src/components/admin/AdminPage.tsx
+++ b/frontend-react/src/components/admin/AdminPage.tsx
@@ -14,7 +14,7 @@ import { useToast, Heading, Flex, Box } from "@chakra-ui/core"
 import Input from "../elements/Input"
 import Button from "../elements/Button"
 
-const AdminPage: React.FC<RouteComponentProps> = ({}) => {
+const AdminPage: React.FC<RouteComponentProps> = () => {
   const [updateTwitterForms, setUpdateTwitterForms] = useState<
     Partial<UpdateTwitterVars>
   >({})
diff --git a/frontend-react/src/components/elements/Alert.tsx b/frontend-react/src/components/elements/Alert.tsx
index b8cd91c44..e1e2dfe81 100644
--- a/frontend-react/src/components/elements/Alert.tsx
+++ b/frontend-react/src/components/elements/Alert.tsx
@@ -4,12 +4,18 @@ import { Alert as ChakraAlert, AlertIcon, CloseButton } from "@chakra-ui/core"
 interface AlertProps {
   children: string | string[]
   status: "error" | "success" | "warning" | "info"
+  mt?: string
   onClose?: () => void
 }
 
-const Alert: React.FC<AlertProps> = ({ children, status, onClose }) => {
+const Alert: React.FC<AlertProps> = ({
+  children,
+  status,
+  onClose,
+  mt = "2em",
+}) => {
   return (
-    <ChakraAlert status={status} borderRadius="5px" mt="2em">
+    <ChakraAlert status={status} borderRadius="5px" mt={mt}>
       <AlertIcon />
       {children}
       {onClose && (
diff --git a/frontend-react/src/components/freeagents/FreeAgentsPage.tsx b/frontend-react/src/components/freeagents/FreeAgentsPage.tsx
index 0fc2dd7af..006afd23f 100644
--- a/frontend-react/src/components/freeagents/FreeAgentsPage.tsx
+++ b/frontend-react/src/components/freeagents/FreeAgentsPage.tsx
@@ -27,6 +27,7 @@ import {
   FREE_AGENT_MATCHES,
 } from "../../graphql/queries/freeAgentMatches"
 import Matches from "./Matches"
+import Alert from "../elements/Alert"
 
 const playstyleToEnum = {
   "Frontline/Slayer": "FRONTLINE",
@@ -116,17 +117,35 @@ const FreeAgentsPage: React.FC<RouteComponentProps> = () => {
     return true
   }
 
-  const showModalButton = () => {
-    if (!userData!.user) return false
+  const getTopRightContent = () => {
+    if (!userData!.user)
+      return (
+        <Box maxW="300px">
+          <Alert status="info" mt="0">
+            Log in to make your own free agent post and start matching!
+          </Alert>
+        </Box>
+      )
 
     if (ownFAPost && ownFAPost.hidden) {
       const weekFromCreatingFAPost = parseInt(ownFAPost.createdAt) + 604800000
       if (weekFromCreatingFAPost > Date.now()) {
-        return false
+        return (
+          <Box maxW="300px">
+            <Alert status="info" mt="0">
+              You need to wait a week after deleting your old free agent post
+              before making a new one
+            </Alert>
+          </Box>
+        )
       }
     }
 
-    return true
+    return (
+      <Box m="0.5em">
+        <Button onClick={() => setShowModal(true)}>{buttonText}</Button>
+      </Box>
+    )
   }
 
   return (
@@ -147,11 +166,7 @@ const FreeAgentsPage: React.FC<RouteComponentProps> = () => {
             {showFilters ? "Hide filters" : "Show filters"}
           </Button>
         </Box>
-        {showModalButton() && (
-          <Box m="0.5em">
-            <Button onClick={() => setShowModal(true)}>{buttonText}</Button>
-          </Box>
-        )}
+        {getTopRightContent()}
       </Flex>
       <Collapse mt={4} isOpen={showFilters}>
         <Box maxW="600px" my="1em">