diff --git a/person.py b/person.py
index 0d45c6dd0..767a5bfac 100644
--- a/person.py
+++ b/person.py
@@ -266,6 +266,7 @@ def createPerson(baseDir: str,nickname: str,domain: str,port: int, \
         setRole(baseDir,nickname,domain,'instance','admin')
         setRole(baseDir,nickname,domain,'instance','moderator')
         setRole(baseDir,nickname,domain,'instance','delegator')
+        setConfigParam(baseDir,'admin',nickname)
 
     if not os.path.isdir(baseDir+'/accounts'):
         os.mkdir(baseDir+'/accounts')
diff --git a/webinterface.py b/webinterface.py
index 00a8bd0ef..c7183178a 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -570,7 +570,7 @@ def htmlProfile(baseDir: str,httpPrefix: str,authorized: bool, \
     if not authorized:
         loginButton='<br><a href="/login"><button class="loginButton">Login</button></a>'
     else:
-        editProfileStr='<a href="'+actor+'/editprofile"><button class="button"><span>Profile </span></button></a>'
+        editProfileStr='<a href="'+actor+'/editprofile"><button class="button"><span>Edit </span></button></a>'
         linkToTimelineStart='<a href="/users/'+nickname+'/inbox" title="Switch to timeline view" alt="Switch to timeline view">'
         linkToTimelineEnd='</a>'
         # are there any follow requests?