diff --git a/CHANGELOG b/CHANGELOG
index 943c63f2b..792fcd637 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -261,7 +261,7 @@ Changes:
   `/affiliation register`
 - Fix segfault on `/sendfile` using OMEMO on Raspberry Pi (#1512)
 - Use shorter IDs (#1520)
-- Add abbility to launch external editor to write (multiline) messages (#1485, #1546)
+- Add ability to launch external editor to write (multiline) messages (#1485, #1546)
   `/editor`
 - Introdcue OMEMO trustmode (#1506)
   `/omemo trustmode manual|firstusage|blind`
@@ -683,7 +683,7 @@ Changes:
 - HTTP file upload (xep-0363) (/sendfile)
 - Blocking command (xep-0191) (/blocked)
 - Allow auto extended away (/autoaway)
-- Include last acitvity in initial presence (xep-0256) (/lastactivity)
+- Include last activity in initial presence (xep-0256) (/lastactivity)
 - Last Activity (xep-0012) (/lastactivity)
 - Ability to run command scripts (/script)
 - Account startscript property to execute a command script on connect (/account)
diff --git a/src/command/cmd_defs.c b/src/command/cmd_defs.c
index b6f4e3697..ea59bb6d3 100644
--- a/src/command/cmd_defs.c
+++ b/src/command/cmd_defs.c
@@ -2325,12 +2325,12 @@ static const struct cmd_t command_defs[] = {
         CMD_DESC(
             "OMEMO commands to manage keys, and perform encryption during chat sessions.")
         CMD_ARGS(
-            { "gen",                     "Generate OMEMO crytographic materials for current account." },
+            { "gen",                     "Generate OMEMO cryptographic materials for current account." },
             { "start [<contact>]",       "Start an OMEMO session with contact, or current recipient if omitted." },
             { "end",                     "End the current OMEMO session." },
             { "log on|off",              "Enable or disable plaintext logging of OMEMO encrypted messages." },
             { "log redact",              "Log OMEMO encrypted messages, but replace the contents with [redacted]." },
-            { "fingerprint [<contact>]", "Show contact fingerprints, or current recipient if omitted." },
+            { "fingerprint [<contact>]", "Show contact's fingerprints, or current recipient's if omitted." },
             { "char <char>",             "Set the character to be displayed next to OMEMO encrypted messages." },
             { "trustmode manual",        "Set the global OMEMO trust mode to manual, OMEMO keys has to be trusted manually." },
             { "trustmode firstusage",    "Set the global OMEMO trust mode to ToFu, first OMEMO keys trusted automatically." },
diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c
index eefe5a577..857f24e61 100644
--- a/src/command/cmd_funcs.c
+++ b/src/command/cmd_funcs.c
@@ -8645,15 +8645,15 @@ cmd_omemo_gen(ProfWin* window, const char* const command, gchar** args)
     }
 
     if (omemo_loaded()) {
-        cons_show("OMEMO crytographic materials have already been generated.");
+        cons_show("OMEMO cryptographic materials have already been generated.");
         return TRUE;
     }
 
-    cons_show("Generating OMEMO crytographic materials, it may take a while…");
+    cons_show("Generating OMEMO cryptographic materials, it may take a while…");
     ui_update();
     ProfAccount* account = accounts_get_account(session_get_account_name());
     omemo_generate_crypto_materials(account);
-    cons_show("OMEMO crytographic materials generated. Your Device ID is %d.", omemo_device_id());
+    cons_show("OMEMO cryptographic materials generated. Your Device ID is %d.", omemo_device_id());
     return TRUE;
 #else
     cons_show("This version of Profanity has not been built with OMEMO support enabled");
diff --git a/src/xmpp/iq.c b/src/xmpp/iq.c
index 42c2ae4b9..793dbc597 100644
--- a/src/xmpp/iq.c
+++ b/src/xmpp/iq.c
@@ -1843,7 +1843,7 @@ _room_config_id_handler(xmpp_stanza_t* const stanza, void* const userdata)
 
     if (from == NULL) {
         log_warning("No from attribute for IQ config request result");
-        ui_handle_room_configuration_form_error(from, "No from attribute for room cofig response.");
+        ui_handle_room_configuration_form_error(from, "No from attribute for room config response.");
         return 0;
     }