diff --git a/daemon.py b/daemon.py
index fabe8672..939ab845 100644
--- a/daemon.py
+++ b/daemon.py
@@ -2985,9 +2985,15 @@ class PubServer(BaseHTTPRequestHandler):
                                     actorJson['type']='Service'
                                     actorChanged=True
                         else:
-                            if actorJson['type']!='Person':
-                                actorJson['type']='Person'
-                                actorChanged=True
+                            if fields.get('isGroup'):
+                                if fields['isGroup']=='on':
+                                    if actorJson['type']!='Group':
+                                        actorJson['type']='Group'
+                                        actorChanged=True
+                            else:
+                                if actorJson['type']!='Person':
+                                    actorJson['type']='Person'
+                                    actorChanged=True
                         # save filtered words list
                         filterFilename=self.server.baseDir+'/accounts/'+nickname+'@'+self.server.domain+'/filters.txt'
                         if fields.get('filteredWords'):
diff --git a/inbox.py b/inbox.py
index 5f059afd..89d0c886 100644
--- a/inbox.py
+++ b/inbox.py
@@ -728,6 +728,7 @@ def receiveUpdate(session,baseDir: str, \
 
     if messageJson['object']['type']=='Person' or \
        messageJson['object']['type']=='Application' or \
+       messageJson['object']['type']=='Group' or \
        messageJson['object']['type']=='Service':
         if messageJson['object'].get('url') and messageJson['object'].get('id'):
             print('Request to update actor: '+messageJson['actor'])
diff --git a/posts.py b/posts.py
index ba0e32fe..778a94e5 100644
--- a/posts.py
+++ b/posts.py
@@ -1399,6 +1399,7 @@ def sendToNamedAddresses(session,baseDir: str, \
             if postJsonObject['type']=='Update' and \
                (postJsonObject['object']['type']=='Person' or \
                 postJsonObject['object']['type']=='Application' or \
+                postJsonObject['object']['type']=='Group' or \
                 postJsonObject['object']['type']=='Service'):
                 # use the original object, which has a 'to'
                 recipientsObject=postJsonObject
@@ -1567,6 +1568,7 @@ def sendToFollowers(session,baseDir: str, \
                             if postJsonObject['object'].get('type'):
                                 if postJsonObject['object']['type']=='Person' or \
                                    postJsonObject['object']['type']=='Application' or \
+                                   postJsonObject['object']['type']=='Group' or \
                                    postJsonObject['object']['type']=='Service':
                                     print('Sending profile update to shared inbox of '+toDomain)
                                     toNickname='inbox'
diff --git a/translations/cy.json b/translations/cy.json
index a8cde1cd..412c492e 100644
--- a/translations/cy.json
+++ b/translations/cy.json
@@ -139,5 +139,6 @@
     "Page up": "Tudalen i fyny",
     "Vote": "Bleidleisio",
     "Replies": "Atebion",
-    "Media": "Media"
+    "Media": "Media",
+    "This is a group account": "This is a group account"
 }
diff --git a/translations/de.json b/translations/de.json
index 6780cf27..5e93d028 100644
--- a/translations/de.json
+++ b/translations/de.json
@@ -139,5 +139,6 @@
     "Page up": "Bild auf",
     "Vote": "Abstimmung",
     "Replies": "Antworten",
-    "Media": "Media"
+    "Media": "Media",
+    "This is a group account": "This is a group account"
 }
diff --git a/translations/en.json b/translations/en.json
index 512fc5aa..6427f53e 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -139,5 +139,6 @@
     "Page up": "Page up",
     "Vote": "Vote",
     "Replies": "Replies",
-    "Media": "Media"
+    "Media": "Media",
+    "This is a group account": "This is a group account"
 }
diff --git a/translations/es.json b/translations/es.json
index 7df4a9e7..4d16c993 100644
--- a/translations/es.json
+++ b/translations/es.json
@@ -139,5 +139,6 @@
     "Page up": "Página arriba",
     "Vote": "Votar",
     "Replies": "Resp",
-    "Media": "Media"
+    "Media": "Media",
+    "This is a group account": "This is a group account"
 }
diff --git a/translations/fr.json b/translations/fr.json
index 00d66d00..52038258 100644
--- a/translations/fr.json
+++ b/translations/fr.json
@@ -139,5 +139,6 @@
     "Page up": "Haut de page",
     "Vote": "Vote",
     "Replies": "Réponses",
-    "Media": "Media"
+    "Media": "Media",
+    "This is a group account": "This is a group account"
 }
diff --git a/translations/ga.json b/translations/ga.json
index d523d5e6..d8c37cc9 100644
--- a/translations/ga.json
+++ b/translations/ga.json
@@ -139,5 +139,6 @@
     "Page up": "Leathanach suas",
     "Vote": "Vóta",
     "Replies": "Freagraí",
-    "Media": "Media"
+    "Media": "Media",
+    "This is a group account": "This is a group account"
 }
diff --git a/translations/it.json b/translations/it.json
index 4414d7a4..5f6d97b7 100644
--- a/translations/it.json
+++ b/translations/it.json
@@ -139,5 +139,6 @@
     "Page up": "Pagina su",
     "Vote": "Voto",
     "Replies": "Risposte",
-    "Media": "Media"
+    "Media": "Media",
+    "This is a group account": "This is a group account"
 }
diff --git a/webinterface.py b/webinterface.py
index 2091363f..964e0a6a 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -536,6 +536,7 @@ def htmlEditProfile(translate: {},baseDir: str,path: str,domain: str,port: int)
         return ''
 
     isBot=''
+    isGroup=''
     displayNickname=nickname
     bioStr=''
     manuallyApprovesFollowers=''
@@ -559,6 +560,10 @@ def htmlEditProfile(translate: {},baseDir: str,path: str,domain: str,port: int)
         if actorJson.get('type'):
             if actorJson['type']=='Service':
                 isBot='checked'
+                isGroup=''
+            elif actorJson['type']=='Group':
+                isGroup='checked'
+                isBot=''
                 
     filterStr=''
     filterFilename=baseDir+'/accounts/'+nickname+'@'+domain+'/filters.txt'
@@ -639,6 +644,7 @@ def htmlEditProfile(translate: {},baseDir: str,path: str,domain: str,port: int)
         '    <div class="container">' \
         '      <input type="checkbox" class=profilecheckbox" name="approveFollowers" '+manuallyApprovesFollowers+'>'+translate['Approve follower requests']+'<br>' \
         '      <input type="checkbox" class=profilecheckbox" name="isBot" '+isBot+'>'+translate['This is a bot account']+'<br>' \
+        '      <input type="checkbox" class=profilecheckbox" name="isGroup" '+isGroup+'>'+translate['This is a group account']+'<br>' \
         '      <br><b>'+translate['Filtered words']+'</b>' \
         '      <br>'+translate['One per line']+ \
         '      <textarea id="message" name="filteredWords" placeholder="" style="height:200px">'+filterStr+'</textarea>' \