diff --git a/app/assets/javascripts/app/controllers/ticket_overview.js.coffee b/app/assets/javascripts/app/controllers/ticket_overview.js.coffee
index 91e0dd767..be234f00a 100644
--- a/app/assets/javascripts/app/controllers/ticket_overview.js.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_overview.js.coffee
@@ -116,7 +116,7 @@ class Table extends App.Controller
 
     return if !@view
 
-    # fetch inital data
+    # fetch initial data
     if !@cache || !@cache[@view]
       @fetch()
     else
diff --git a/app/assets/javascripts/app/lib/app_post/websocket.js.coffee b/app/assets/javascripts/app/lib/app_post/websocket.js.coffee
index 3e4c2bc79..6b3e55408 100644
--- a/app/assets/javascripts/app/lib/app_post/websocket.js.coffee
+++ b/app/assets/javascripts/app/lib/app_post/websocket.js.coffee
@@ -87,7 +87,7 @@ class _webSocketSingleton extends App.Controller
       'ws'
     )
 
-    # inital connect
+    # initial connect
     @connect()
 
   channel: ->
diff --git a/app/assets/javascripts/app/views/profile/avatar.jst.eco b/app/assets/javascripts/app/views/profile/avatar.jst.eco
index cb060495f..666ceace7 100644
--- a/app/assets/javascripts/app/views/profile/avatar.jst.eco
+++ b/app/assets/javascripts/app/views/profile/avatar.jst.eco
@@ -12,7 +12,7 @@
 <div class="avatar-gallery horizontal wrap">
   <% for avatar in @avatars: %>
   <div class="avatar-holder">
-    <% if avatar.inital: %>
+    <% if avatar.initial: %>
       <% cssClass = '' %>
       <% if avatar.default: %>
       <%  cssClass = 'is-active' %>
diff --git a/app/models/avatar.rb b/app/models/avatar.rb
index 4fcdf623e..486c3fedd 100644
--- a/app/models/avatar.rb
+++ b/app/models/avatar.rb
@@ -80,8 +80,7 @@ add a avatar
       :object_lookup_id => object_id,
       :default          => true,
       :deletable        => data[:deletable],
-      # @TODO Check how to fix typos in database fields inital -> initial
-      :initial           => false,
+      :initial          => false,
       :source           => data[:source],
       :source_url       => data[:url],
       :updated_by_id    => data[:updated_by_id],