diff --git a/epicyon.py b/epicyon.py
index 19ad4ffe1..81ca2e480 100644
--- a/epicyon.py
+++ b/epicyon.py
@@ -7,6 +7,7 @@ __email__ = "bob@freedombone.net"
 __status__ = "Production"
 
 from person import createPerson
+from person import createGroup
 from person import createSharedInbox
 from person import createCapabilitiesInbox
 from person import setDisplayNickname
@@ -108,6 +109,9 @@ parser.add_argument('--path', dest='baseDir', \
 parser.add_argument('-a','--addaccount', dest='addaccount', \
                     type=str,default=None, \
                     help='Adds a new account')
+parser.add_argument('-g','--addgroup', dest='addgroup', \
+                    type=str,default=None, \
+                    help='Adds a new group')
 parser.add_argument('-r','--rmaccount', dest='rmaccount', \
                     type=str,default=None, \
                     help='Remove an account')
@@ -923,6 +927,34 @@ if args.addaccount:
         print('Account creation failed')
     sys.exit()
 
+if args.addgroup:
+    if '@' in args.addgroup:
+        nickname=args.addgroup.split('@')[0]
+        domain=args.addgroup.split('@')[1]
+    else:
+        nickname=args.addgroup
+        if not args.domain or not getConfigParam(baseDir,'domain'):
+            print('Use the --domain option to set the domain name')
+            sys.exit()
+    if not validNickname(domain,nickname):
+        print(nickname+' is a reserved name. Use something different.')
+        sys.exit()
+    if not args.password:
+        print('Use the --password option to set the password for '+nickname)
+        sys.exit()
+    if len(args.password.strip())<8:
+        print('Password should be at least 8 characters')
+        sys.exit()
+    if os.path.isdir(baseDir+'/accounts/'+nickname+'@'+domain):
+        print('Group already exists')
+        sys.exit()
+    createGroup(baseDir,nickname,domain,port,httpPrefix,True,args.password.strip())
+    if os.path.isdir(baseDir+'/accounts/'+nickname+'@'+domain):
+        print('Group created for '+nickname+'@'+domain)
+    else:
+        print('Group creation failed')
+    sys.exit()
+
 if args.rmaccount:
     if '@' in args.rmaccount:
         nickname=args.rmaccount.split('@')[0]
diff --git a/inbox.py b/inbox.py
index 03d1083e6..526d51dfe 100644
--- a/inbox.py
+++ b/inbox.py
@@ -46,6 +46,7 @@ from blocking import isBlockedDomain
 from posts import downloadAnnounce
 from posts import isDM
 from posts import isReply
+from posts import sendSignedJson
 
 def validInbox(baseDir: str,nickname: str,domain: str) -> bool:
     """Checks whether files were correctly saved to the inbox
diff --git a/person.py b/person.py
index ddf952e6e..55c3d9c3f 100644
--- a/person.py
+++ b/person.py
@@ -318,6 +318,16 @@ def registerAccount(baseDir: str,httpPrefix: str,domain: str,port: int, \
         return True
     return False
 
+def createGroup(baseDir: str,nickname: str,domain: str,port: int, \
+                httpPrefix: str, saveToFile: bool,password=None) -> (str,str,{},{}):
+    """Returns a group
+    """
+    privateKeyPem,publicKeyPem,newPerson,webfingerEndpoint= \
+        createPerson(baseDir,nickname,domain,port, \
+                     httpPrefix,saveToFile,password)
+    newPerson['type']='Group'
+    return privateKeyPem,publicKeyPem,newPerson,webfingerEndpoint
+
 def createPerson(baseDir: str,nickname: str,domain: str,port: int, \
                  httpPrefix: str, saveToFile: bool,password=None) -> (str,str,{},{}):
     """Returns the private key, public key, actor and webfinger endpoint