diff --git a/CHANGELOG b/CHANGELOG
index 260f62dfe..040bd89a2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1477,7 +1477,7 @@ Version 3.6 (2018-03-23)
     Enhancements to the probing of pump.io profiles [annando]
     Enhancements to the handling of BBCode tags [MrPetovan]
     Enhancements to the OEmbed handling [MrPetovan]
-    Fixed a bug that triggered the display of activities on the cummunity page [annando]
+    Fixed a bug that triggered the display of activities on the community page [annando]
     Fixed a bug with personal notes [annando]
     Fixed a display issue of long postings when using the showmore option [annando]
     Fixed a bug that caused Twidere to crash on reload [annando]
diff --git a/src/Module/Conversation/Community.php b/src/Module/Conversation/Community.php
index 818943733..ae6297e48 100644
--- a/src/Module/Conversation/Community.php
+++ b/src/Module/Conversation/Community.php
@@ -302,7 +302,7 @@ class Community extends BaseModule
 	}
 
 	/**
-	 * Database query for the comunity page
+	 * Database query for the community page
 	 *
 	 * @param $min_id
 	 * @param $max_id
diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php
index 84d08ff9c..5f8f925a3 100644
--- a/src/Module/Conversation/Network.php
+++ b/src/Module/Conversation/Network.php
@@ -120,7 +120,7 @@ class Network extends BaseModule
 			$content = '';
 
 			if (self::$forumContactId) {
-				// If self::$forumContactId belongs to a communitity forum or a privat goup,.add a mention to the status editor
+				// If self::$forumContactId belongs to a community forum or a privat goup,.add a mention to the status editor
 				$condition = ["`id` = ? AND `contact-type` = ?", self::$forumContactId, Contact::TYPE_COMMUNITY];
 				$contact = DBA::selectFirst('contact', ['addr'], $condition);
 				if (!empty($contact['addr'])) {
diff --git a/view/theme/vier/templates/communityhome.tpl b/view/theme/vier/templates/communityhome.tpl
index 94c8abcd7..24f2ac98c 100644
--- a/view/theme/vier/templates/communityhome.tpl
+++ b/view/theme/vier/templates/communityhome.tpl
@@ -4,11 +4,11 @@
 </div>
 {{/if}}
 
-{{if $comunity_profiles_title}}
+{{if $community_profiles_title}}
 <div id="right_profiles" class="widget">
-<h3>{{$comunity_profiles_title}}</h3>
+<h3>{{$community_profiles_title}}</h3>
 <div id='lastusers-wrapper' class='items-wrapper'>
-{{foreach $comunity_profiles_items as $i}}
+{{foreach $community_profiles_items as $i}}
 	{{$i nofilter}}
 {{/foreach}}
 </div>
diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index 9ddf7a4de..91e050c66 100644
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -140,14 +140,14 @@ function vier_community_info()
 	$url = DI::baseUrl();
 	$aside['$url'] = $url;
 
-	// comunity_profiles
+	// community_profiles
 	if ($show_profiles) {
 		$contacts = Contact\Relation::getCachedSuggestions(DI::userSession()->getLocalUserId(), 0, 9);
 
 		$tpl = Renderer::getMarkupTemplate('ch_directory_item.tpl');
 		if (DBA::isResult($contacts)) {
-			$aside['$comunity_profiles_title'] = DI::l10n()->t('Community Profiles');
-			$aside['$comunity_profiles_items'] = [];
+			$aside['$community_profiles_title'] = DI::l10n()->t('Community Profiles');
+			$aside['$community_profiles_items'] = [];
 
 			foreach ($contacts as $contact) {
 				$entry = Renderer::replaceMacros($tpl, [
@@ -156,7 +156,7 @@ function vier_community_info()
 					'$photo' => Contact::getMicro($contact),
 					'$alt_text' => $contact['name'],
 				]);
-				$aside['$comunity_profiles_items'][] = $entry;
+				$aside['$community_profiles_items'][] = $entry;
 			}
 		}
 	}