diff --git a/app/views/admin/conferences/edit.html.haml b/app/views/admin/conferences/edit.html.haml
index 2d5df126..49d65235 100644
--- a/app/views/admin/conferences/edit.html.haml
+++ b/app/views/admin/conferences/edit.html.haml
@@ -9,6 +9,7 @@
     = semantic_form_for(@conference, url: admin_conference_path(@conference.short_title), html: {multipart: true}) do |f|
       = f.input :title, hint: "The full title of the conference, e.g. 'openSUSE Conference 2014'"
       = f.input :short_title, hint: "A short title, e.g. 'oSC14', to be used in URLs"
+      = f.input :organization, hint: 'The organization in which this conference belongs', input_html: { disabled: true }
       = f.input :description, hint: markdown_hint('A description of the conference.'), input_html: { rows: 5, data: { provide: 'markdown-editable' } }
       = f.input :color, hint: 'The color will be used eg for the dashboard.', input_html: {size: 6, type: 'color'}
       = f.label 'Conference Logo'
diff --git a/app/views/admin/conferences/show.html.haml b/app/views/admin/conferences/show.html.haml
index cddae4c2..f270867b 100644
--- a/app/views/admin/conferences/show.html.haml
+++ b/app/views/admin/conferences/show.html.haml
@@ -1,6 +1,6 @@
 %h1
   %span.fa.fa-tachometer
-  Dashboard for #{@conference.title}
+  Dashboard for #{@conference.title} ( by #{@conference.organization.name} )
 %hr
 .row
   .col-sm-4.col-xs-4
diff --git a/app/views/conferences/show.html.haml b/app/views/conferences/show.html.haml
index fb488e22..b133c26a 100644
--- a/app/views/conferences/show.html.haml
+++ b/app/views/conferences/show.html.haml
@@ -22,6 +22,9 @@
               .col-md-8
                 %h1
                   = @conference.title
+                %h3
+                  %i
+                    = "( by #{@conference.organization.name} )"
                 %p.lead
                   - if @conference.venue
                     = "#{@conference.venue.city} / #{@conference.venue.country_name}"
diff --git a/spec/features/conference_spec.rb b/spec/features/conference_spec.rb
index d17ce5fc..5b9f9c54 100644
--- a/spec/features/conference_spec.rb
+++ b/spec/features/conference_spec.rb
@@ -71,6 +71,15 @@ feature Conference do
   end
 
   describe 'admin' do
+    let!(:conference) { create(:conference) }
+
+    scenario 'has organization name in edit form', feature: true, js: true do
+      sign_in user
+      visit edit_admin_conference_path(conference.short_title)
+      org_id = find('#conference_organization_id').value
+      expect(Organization.find(org_id)).to eq conference.organization
+    end
+
     it_behaves_like 'add and update conference'
   end
 end
diff --git a/spec/features/splashpage_spec.rb b/spec/features/splashpage_spec.rb
index e913d023..ee9b63d5 100644
--- a/spec/features/splashpage_spec.rb
+++ b/spec/features/splashpage_spec.rb
@@ -61,4 +61,15 @@ feature Splashpage do
       expect(current_path).to eq(root_path)
     end
   end
+
+  context 'public splashpage already created' do
+    let!(:splashpage) { create(:splashpage, conference: conference, public: true)}
+
+    scenario 'should have organization name', feature: true, js: true do
+      sign_in participant
+      visit conference_path(conference.short_title)
+
+      expect(page).to have_text(conference.organization.name)
+    end
+  end
 end