diff --git a/appinfo/info.xml b/appinfo/info.xml
index f0888724..76a3148f 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -46,13 +46,15 @@
 	</repair-steps>
 
 	<commands>
+		<command>OCA\Social\Command\AccountCreate</command>
+		<command>OCA\Social\Command\AccountFollowing</command>
 		<command>OCA\Social\Command\CacheRefresh</command>
 		<command>OCA\Social\Command\CheckInstall</command>
 		<command>OCA\Social\Command\Fediverse</command>
 		<command>OCA\Social\Command\NoteCreate</command>
 		<command>OCA\Social\Command\NoteBoost</command>
-		<command>OCA\Social\Command\Timeline</command>
 		<command>OCA\Social\Command\Reset</command>
+		<command>OCA\Social\Command\Timeline</command>
 		<command>OCA\Social\Command\QueueStatus</command>
 		<command>OCA\Social\Command\QueueProcess</command>
 	</commands>
diff --git a/lib/Command/AccountCreate.php b/lib/Command/AccountCreate.php
new file mode 100644
index 00000000..c42d4757
--- /dev/null
+++ b/lib/Command/AccountCreate.php
@@ -0,0 +1,123 @@
+<?php
+declare(strict_types=1);
+
+
+/**
+ * Nextcloud - Social Support
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018, Maxence Lange <maxence@artificial-owl.com>
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCA\Social\Command;
+
+
+use Exception;
+use OC\Core\Command\Base;
+use OCA\Social\Service\AccountService;
+use OCA\Social\Service\CacheActorService;
+use OCA\Social\Service\ConfigService;
+use OCA\Social\Service\MiscService;
+use OCP\IUserManager;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+
+class AccountCreate extends Base {
+
+
+	/** @var IUserManager */
+	private $userManager;
+
+	/** @var AccountService */
+	private $accountService;
+
+	/** @var CacheActorService */
+	private $cacheActorService;
+
+	/** @var ConfigService */
+	private $configService;
+
+	/** @var MiscService */
+	private $miscService;
+
+
+	/**
+	 * CacheUpdate constructor.
+	 *
+	 * @param IUserManager $userManager
+	 * @param AccountService $accountService
+	 * @param CacheActorService $cacheActorService
+	 * @param ConfigService $configService
+	 * @param MiscService $miscService
+	 */
+	public function __construct(
+		IUserManager $userManager, AccountService $accountService,
+		CacheActorService $cacheActorService, ConfigService $configService, MiscService $miscService
+	) {
+		parent::__construct();
+
+		$this->userManager = $userManager;
+
+		$this->accountService = $accountService;
+		$this->cacheActorService = $cacheActorService;
+		$this->configService = $configService;
+		$this->miscService = $miscService;
+	}
+
+
+	/**
+	 *
+	 */
+	protected function configure() {
+		parent::configure();
+		$this->setName('social:account:create')
+			 ->addArgument('userId', InputArgument::REQUIRED, 'Nextcloud username of the account')
+			 ->addOption('handle', '', InputOption::VALUE_REQUIRED, 'social handle')
+			 ->setDescription('Create a new social account');
+	}
+
+
+	/**
+	 * @param InputInterface $input
+	 * @param OutputInterface $output
+	 *
+	 * @throws Exception
+	 */
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		$userId = $input->getArgument('userId');
+
+		if (($handle = $input->getOption('handle')) === null) {
+			$handle = $userId;
+		}
+
+		if ($this->userManager->get($userId) === null) {
+			throw new Exception('Unknown user');
+		}
+
+		$this->accountService->createActor($userId, $handle);
+	}
+
+}
+
diff --git a/lib/Command/AccountFollowing.php b/lib/Command/AccountFollowing.php
new file mode 100644
index 00000000..5833ef11
--- /dev/null
+++ b/lib/Command/AccountFollowing.php
@@ -0,0 +1,127 @@
+<?php
+declare(strict_types=1);
+
+
+/**
+ * Nextcloud - Social Support
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018, Maxence Lange <maxence@artificial-owl.com>
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCA\Social\Command;
+
+
+use Exception;
+use OC\Core\Command\Base;
+use OCA\Social\Service\AccountService;
+use OCA\Social\Service\CacheActorService;
+use OCA\Social\Service\ConfigService;
+use OCA\Social\Service\FollowService;
+use OCA\Social\Service\MiscService;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+
+class AccountFollowing extends Base {
+
+
+	/** @var AccountService */
+	private $accountService;
+
+	/** @var CacheActorService */
+	private $cacheActorService;
+
+	/** @var FollowService */
+	private $followService;
+
+	/** @var ConfigService */
+	private $configService;
+
+	/** @var MiscService */
+	private $miscService;
+
+
+	/**
+	 * CacheUpdate constructor.
+	 *
+	 * @param AccountService $accountService
+	 * @param CacheActorService $cacheActorService
+	 * @param FollowService $followService
+	 * @param ConfigService $configService
+	 * @param MiscService $miscService
+	 */
+	public function __construct(
+		AccountService $accountService, CacheActorService $cacheActorService,
+		FollowService $followService, ConfigService $configService, MiscService $miscService
+	) {
+		parent::__construct();
+
+		$this->accountService = $accountService;
+		$this->cacheActorService = $cacheActorService;
+		$this->followService = $followService;
+		$this->configService = $configService;
+		$this->miscService = $miscService;
+	}
+
+
+	/**
+	 *
+	 */
+	protected function configure() {
+		parent::configure();
+		$this->setName('social:account:following')
+			 ->addArgument('userId', InputArgument::REQUIRED, 'Nextcloud userid')
+			 ->addArgument('account', InputArgument::REQUIRED, 'Account to follow')
+			 ->addOption('local', '', InputOption::VALUE_NONE, 'account is local')
+			 ->addOption('unfollow', '', InputOption::VALUE_NONE, 'unfollow')
+			 ->setDescription('Following a new account');
+	}
+
+
+	/**
+	 * @param InputInterface $input
+	 * @param OutputInterface $output
+	 *
+	 * @throws Exception
+	 */
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		$userId = $input->getArgument('userId');
+		$account = $input->getArgument('account');
+
+		$actor = $this->accountService->getActor($userId);
+		if ($input->getOption('local')) {
+			$local = $this->cacheActorService->getFromLocalAccount($account);
+			$account = $local->getAccount();
+		}
+
+		if ($input->getOption('unfollow')) {
+			$this->followService->unfollowAccount($actor, $account);
+		} else {
+			$this->followService->followAccount($actor, $account);
+		}
+	}
+
+}
+