diff --git a/app/models/problem.rb b/app/models/problem.rb
index a1adcd9..4652b51 100644
--- a/app/models/problem.rb
+++ b/app/models/problem.rb
@@ -10,4 +10,8 @@ class Problem < ActiveRecord::Base
     !!self.translation
   end
 
+
+  def original_url
+    "https://projecteuler.net/problem=#{self.id}"
+  end
 end
diff --git a/app/models/translation.rb b/app/models/translation.rb
index f487ca5..04227f5 100644
--- a/app/models/translation.rb
+++ b/app/models/translation.rb
@@ -5,8 +5,4 @@ class Translation < ActiveRecord::Base
   validates :title, uniqueness: true
 
   self.per_page = 50
-
-  def original_url
-    "https://projecteuler.net/problem=#{id}"
-  end
 end
diff --git a/app/views/problems/show.html.erb b/app/views/problems/show.html.erb
index e165f6a..4ad7873 100644
--- a/app/views/problems/show.html.erb
+++ b/app/views/problems/show.html.erb
@@ -12,5 +12,5 @@
     </div>
 <% end %>
 <div class="text-center">
-  <%= link_to 'Dieses Problem auf projecteuler.net', @problem.translation.original_url, target: '_blank' %>
+  <%= link_to 'Dieses Problem auf projecteuler.net', @problem.original_url, target: '_blank' %>
 </div>
\ No newline at end of file
diff --git a/app/views/translations/show.html.erb b/app/views/translations/show.html.erb
index a58c437..c7fb342 100644
--- a/app/views/translations/show.html.erb
+++ b/app/views/translations/show.html.erb
@@ -3,7 +3,7 @@
 <% end %>
 
 <div class="page-header">
-  <h1><%= @translation.title %> <small>Problem <%= @translation.id %></small></h1>
+  <h1><%= @translation.title %> <small>Problem <%= @translation.problem_id %></small></h1>
 </div>
 
 <%= panel do %>
@@ -12,6 +12,6 @@
     </div>
 <% end %>
 <div class="text-center">
-  <%= link_to 'Dieses Problem auf projecteuler.net', @translation.original_url, target: '_blank' %>
+  <%= link_to 'Dieses Problem auf projecteuler.net', @translation.problem.original_url, target: '_blank' %>
 </div>
 <%= link_to 'Edit', edit_translation_path(@translation), class: 'btn btn-default' %>
diff --git a/test/models/problem_test.rb b/test/models/problem_test.rb
index 0888bd7..595651f 100644
--- a/test/models/problem_test.rb
+++ b/test/models/problem_test.rb
@@ -13,4 +13,8 @@ class ProblemTest < ActiveSupport::TestCase
   test "is_translated? should return true for existing translation" do
     assert problems(:one).is_translated?
   end
+
+  test "should have correct original url" do
+    assert_equal "https://projecteuler.net/problem=1", problems(:one).original_url
+  end
 end
diff --git a/test/models/translation_test.rb b/test/models/translation_test.rb
index 088628e..b2c3ebc 100644
--- a/test/models/translation_test.rb
+++ b/test/models/translation_test.rb
@@ -27,9 +27,4 @@ class TranslationTest < ActiveSupport::TestCase
     )
     assert translation.save
   end
-
-  test "should have correct original url" do
-    first = Translation.first
-    assert_equal "https://projecteuler.net/problem=#{first.id}", first.original_url
-  end
 end