diff --git a/pages/tournament.js b/pages/tournament.js
index 779a0ba..dbff215 100644
--- a/pages/tournament.js
+++ b/pages/tournament.js
@@ -31,16 +31,17 @@ import {
     verifyCredentials
 } from '../js/api';
 
-class TournamentPage extends React.Component {
+class PrivateTournamentPage extends React.Component {
 
     render() {
         const { id, description, isPublic, code, ownerUsername, playoffStages } = this.props.tournament;
+        const { isSignedIn, username } = this.props;
         
         // TODO: Change href-prop of the anchor tag to contain the tournament code
         return (
             <div className='pb-5'>
                 <Container>
-                    <EditButton id={id} ownerName={ownerUsername}/>
+                    <EditButton id={id} ownerName={ownerUsername} isSignedIn={isSignedIn} username={username}/>
                     <p>{description}</p>
                     <ListGroup>
                         <ListGroupItem>
@@ -59,7 +60,16 @@ class TournamentPage extends React.Component {
     }
 }
 
-function PrivateEditButton(props) {
+function mapStateToTournamentPageProperties(state) {
+    const { isSignedIn, username } = state.userinfo;
+    return { isSignedIn, username };
+}
+
+const TournamentPage = connect(
+    mapStateToTournamentPageProperties
+)(PrivateTournamentPage);
+
+function EditButton(props) {
     const { id, ownerName, isSignedIn, username } = props;
 
     if(isSignedIn && ownerName === username) {
@@ -71,15 +81,6 @@ function PrivateEditButton(props) {
     }
 }
 
-function mapStateToEditButtonProperties(state) {
-    const { isSignedIn, username } = state.userinfo;
-    return { isSignedIn, username };
-}
-
-const EditButton = connect(
-    mapStateToEditButtonProperties
-)(PrivateEditButton);
-
 function getLevelName(levelNumber) {
     const names = ['Finale', 'Halbfinale', 'Viertelfinale', 'Achtelfinale'];
     if(levelNumber < names.length){