diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 317e46f..4772fd4 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -383,11 +383,14 @@ module ApplicationHelper
   end

   # Returns a string for users/groups option tags
-  def principals_options_for_select(collection, selected=nil)
+  def principals_options_for_select(collection, selected=nil, author=nil)
     s = ''
     if collection.include?(User.current)
       s << content_tag('option', "<< #{l(:label_me)} >>", :value => User.current.id)
     end
+    if author.present? && collection.include?(author)
+      s << content_tag('option', "<< #{l(:label_author)} >>", :value => author.id)
+    end
     groups = ''
     collection.sort.each do |element|
       selected_attribute = ' selected="selected"' if option_value_selected?(element, selected) || element.id.to_s == selected
diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb
index 7cae91f..a492561 100644
--- a/app/views/issues/_attributes.html.erb
+++ b/app/views/issues/_attributes.html.erb
@@ -15,7 +15,7 @@
 <% end %>

 <% if @issue.safe_attribute? 'assigned_to_id' %>
-<p><%= f.select :assigned_to_id, principals_options_for_select(@issue.assignable_users, @issue.assigned_to), :include_blank => true, :required => @issue.required_attribute?('assigned_to_id') %></p>
+<p><%= f.select :assigned_to_id, principals_options_for_select(@issue.assignable_users, @issue.assigned_to, @issue.author), :include_blank => true, :required => @issue.required_attribute?('assigned_to_id') %></p>
 <% end %>

 <% if @issue.safe_attribute?('category_id') && @issue.project.issue_categories.any? %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index e6d7077..8bdb401 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -777,6 +777,7 @@ en:
   label_disabled: disabled
   label_show_completed_versions: Show completed versions
   label_me: me
+  label_author: author
   label_board: Forum
   label_board_new: New forum
   label_board_plural: Forums
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 579d327..25ec1fb 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -488,6 +488,7 @@ pl:
   label_logout: Wylogowanie
   label_max_size: Maksymalny rozmiar
   label_me: ja
+  label_author: autor
   label_member: Uczestnik
   label_member_new: Nowy uczestnik
   label_member_plural: Uczestnicy