diff --git a/app/controllers/orgs_controller.rb b/app/controllers/orgs_controller.rb
index 696abc3..7b4397e 100644
--- a/app/controllers/orgs_controller.rb
+++ b/app/controllers/orgs_controller.rb
@@ -52,6 +52,11 @@
     @user = User.new
     # Display the custom Shibboleth discovery service page. 
     @orgs = Org.joins(:identifier_schemes).where('identifier_schemes.name = ?', 'shibboleth').sort{|x,y| x.name <=> y.name }
+    
+    if @orgs.empty?
+      flash[:notice] = _('No institutions are currently registered.')
+      redirect_to user_shibboleth_omniauth_authorize_path 
+    end
   end
 
   # POST /orgs/shibboleth_ds
diff --git a/app/views/orgs/_shibboleth_ds_list.html.erb b/app/views/orgs/_shibboleth_ds_list.html.erb
index c988088..d977253 100644
--- a/app/views/orgs/_shibboleth_ds_list.html.erb
+++ b/app/views/orgs/_shibboleth_ds_list.html.erb
@@ -8,7 +8,9 @@
         <% letter = org.name[0].capitalize %>
       <% end %>
 
-      <li><a href="#"><%= org.name %></a></li>
+      <li>
+        <a href="<%= "#{shibboleth_ds_path}/#{org.id}" %>"><%= org.name %></a>
+      </li>
     <% end %>
   </ul>
 </div>
diff --git a/app/views/orgs/shibboleth_ds.html.erb b/app/views/orgs/shibboleth_ds.html.erb
index 4e30c04..51e6312 100644
--- a/app/views/orgs/shibboleth_ds.html.erb
+++ b/app/views/orgs/shibboleth_ds.html.erb
@@ -85,6 +85,6 @@
   <hr />
   
   <p class="left-indent">
-    <%= _('Institution not a DMPTool partner?') %> <a href="#header-register-form" data-toggle="modal"><%= _('Create an account with any email address')%></a>
+    <%= _('Institution not a %{application_name} partner?') % {application_name: Rails.configuration.branding[:application][:name]} %> <a href="#header-register-form" data-toggle="modal"><%= _('Create an account with any email address')%></a>
   </p>
 </div>
diff --git a/config/routes.rb b/config/routes.rb
index b114317..d006ab1 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -52,6 +52,7 @@
   delete '/users/identifiers/:id', to: 'user_identifiers#destroy', as: 'destroy_user_identifier'
 
   get '/orgs/shibboleth', to: 'orgs#shibboleth_ds', as: 'shibboleth_ds'
+  get '/orgs/shibboleth/:org_name', to: 'orgs#shibboleth_ds_passthru'
   post '/orgs/shibboleth', to: 'orgs#shibboleth_ds_passthru'
 
   #ActiveAdmin.routes(self)
diff --git a/db/schema.rb b/db/schema.rb
index 2cf6d0a..a90e812 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -12,6 +12,7 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema.define(version: 20170607154433) do
+
   create_table "annotations", force: :cascade do |t|
     t.integer  "question_id", limit: 4
     t.integer  "org_id",      limit: 4
@@ -21,8 +22,8 @@
     t.datetime "updated_at"
   end
 
-  add_index "annotations", ["org_id"], name: "fk_rails_aca7521f72"
-  add_index "annotations", ["question_id"], name: "fk_rails_0e08e753b6"
+  add_index "annotations", ["org_id"], name: "fk_rails_aca7521f72", using: :btree
+  add_index "annotations", ["question_id"], name: "fk_rails_0e08e753b6", using: :btree
 
   create_table "answers", force: :cascade do |t|
     t.text     "text",         limit: 65535
@@ -34,17 +35,17 @@
     t.integer  "lock_version", limit: 4,     default: 0
   end
 
-  add_index "answers", ["plan_id"], name: "fk_rails_84a6005a3e"
-  add_index "answers", ["question_id"], name: "fk_rails_3d5ed4418f"
-  add_index "answers", ["user_id"], name: "fk_rails_584be190c2"
+  add_index "answers", ["plan_id"], name: "fk_rails_84a6005a3e", using: :btree
+  add_index "answers", ["question_id"], name: "fk_rails_3d5ed4418f", using: :btree
+  add_index "answers", ["user_id"], name: "fk_rails_584be190c2", using: :btree
 
   create_table "answers_question_options", id: false, force: :cascade do |t|
     t.integer "answer_id",          limit: 4, null: false
     t.integer "question_option_id", limit: 4, null: false
   end
 
-  add_index "answers_question_options", ["answer_id", "question_option_id"], name: "answer_question_option_index"
-  add_index "answers_question_options", ["question_option_id", "answer_id"], name: "question_option_answer_index"
+  add_index "answers_question_options", ["answer_id", "question_option_id"], name: "answer_question_option_index", using: :btree
+  add_index "answers_question_options", ["question_option_id", "answer_id"], name: "question_option_answer_index", using: :btree
 
   create_table "exported_plans", force: :cascade do |t|
     t.integer  "plan_id",    limit: 4
@@ -83,9 +84,9 @@
     t.datetime "created_at"
   end
 
-  add_index "friendly_id_slugs", ["slug", "sluggable_type"], name: "index_friendly_id_slugs_on_slug_and_sluggable_type", unique: true
-  add_index "friendly_id_slugs", ["sluggable_id"], name: "index_friendly_id_slugs_on_sluggable_id"
-  add_index "friendly_id_slugs", ["sluggable_type"], name: "index_friendly_id_slugs_on_sluggable_type"
+  add_index "friendly_id_slugs", ["slug", "sluggable_type"], name: "index_friendly_id_slugs_on_slug_and_sluggable_type", unique: true, using: :btree
+  add_index "friendly_id_slugs", ["sluggable_id"], name: "index_friendly_id_slugs_on_sluggable_id", using: :btree
+  add_index "friendly_id_slugs", ["sluggable_type"], name: "index_friendly_id_slugs_on_sluggable_type", using: :btree
 
   create_table "guidance_groups", force: :cascade do |t|
     t.string   "name",            limit: 255
@@ -96,7 +97,7 @@
     t.boolean  "published"
   end
 
-  add_index "guidance_groups", ["org_id"], name: "fk_rails_819c1dbbc7"
+  add_index "guidance_groups", ["org_id"], name: "fk_rails_819c1dbbc7", using: :btree
 
   create_table "guidances", force: :cascade do |t|
     t.text     "text",              limit: 65535
@@ -107,7 +108,7 @@
     t.boolean  "published"
   end
 
-  add_index "guidances", ["guidance_group_id"], name: "fk_rails_20d29da787"
+  add_index "guidances", ["guidance_group_id"], name: "fk_rails_20d29da787", using: :btree
 
   create_table "identifier_schemes", force: :cascade do |t|
     t.string   "name",             limit: 255
@@ -136,18 +137,21 @@
     t.datetime "updated_at"
   end
 
-  add_index "notes", ["answer_id"], name: "fk_rails_907f8d48bf"
-  add_index "notes", ["user_id"], name: "fk_rails_7f2323ad43"
+  add_index "notes", ["answer_id"], name: "fk_rails_907f8d48bf", using: :btree
+  add_index "notes", ["user_id"], name: "fk_rails_7f2323ad43", using: :btree
 
   create_table "org_identifiers", force: :cascade do |t|
-    t.string   "identifier"
-    t.string   "attrs"
+    t.string   "identifier",           limit: 255
+    t.string   "attrs",                limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "org_id"
-    t.integer  "identifier_scheme_id"
+    t.integer  "org_id",               limit: 4
+    t.integer  "identifier_scheme_id", limit: 4
   end
 
+  add_index "org_identifiers", ["identifier_scheme_id"], name: "fk_rails_189ad2e573", using: :btree
+  add_index "org_identifiers", ["org_id"], name: "fk_rails_36323c0674", using: :btree
+
   create_table "org_token_permissions", force: :cascade do |t|
     t.integer  "org_id",                   limit: 4
     t.integer  "token_permission_type_id", limit: 4
@@ -155,8 +159,8 @@
     t.datetime "updated_at"
   end
 
-  add_index "org_token_permissions", ["org_id"], name: "fk_rails_e1db1b22c5"
-  add_index "org_token_permissions", ["token_permission_type_id"], name: "fk_rails_2aa265f538"
+  add_index "org_token_permissions", ["org_id"], name: "fk_rails_e1db1b22c5", using: :btree
+  add_index "org_token_permissions", ["token_permission_type_id"], name: "fk_rails_2aa265f538", using: :btree
 
   create_table "orgs", force: :cascade do |t|
     t.string   "name",            limit: 255
@@ -178,8 +182,8 @@
     t.integer  "org_type",        limit: 4,     default: 0, null: false
   end
 
-  add_index "orgs", ["language_id"], name: "fk_rails_5640112cab"
-  add_index "orgs", ["region_id"], name: "fk_rails_5a6adf6bab"
+  add_index "orgs", ["language_id"], name: "fk_rails_5640112cab", using: :btree
+  add_index "orgs", ["region_id"], name: "fk_rails_5a6adf6bab", using: :btree
 
   create_table "perms", force: :cascade do |t|
     t.string   "name",       limit: 255
@@ -187,8 +191,8 @@
     t.datetime "updated_at",             null: false
   end
 
-  add_index "perms", ["name"], name: "index_perms_on_name"
-  add_index "perms", ["name"], name: "index_roles_on_name_and_resource_type_and_resource_id"
+  add_index "perms", ["name"], name: "index_perms_on_name", using: :btree
+  add_index "perms", ["name"], name: "index_roles_on_name_and_resource_type_and_resource_id", using: :btree
 
   create_table "phases", force: :cascade do |t|
     t.string   "title",       limit: 255
@@ -201,7 +205,7 @@
     t.boolean  "modifiable"
   end
 
-  add_index "phases", ["template_id"], name: "index_phases_on_template_id"
+  add_index "phases", ["template_id"], name: "index_phases_on_template_id", using: :btree
 
   create_table "plans", force: :cascade do |t|
     t.string   "title",                             limit: 255
@@ -219,15 +223,15 @@
     t.integer  "visibility",                        limit: 4,     default: 0, null: false
   end
 
-  add_index "plans", ["template_id"], name: "index_plans_on_template_id"
+  add_index "plans", ["template_id"], name: "index_plans_on_template_id", using: :btree
 
   create_table "plans_guidance_groups", force: :cascade do |t|
     t.integer "guidance_group_id", limit: 4
     t.integer "plan_id",           limit: 4
   end
 
-  add_index "plans_guidance_groups", ["guidance_group_id"], name: "fk_rails_ec1c5524d7"
-  add_index "plans_guidance_groups", ["plan_id"], name: "fk_rails_13d0671430"
+  add_index "plans_guidance_groups", ["guidance_group_id"], name: "fk_rails_ec1c5524d7", using: :btree
+  add_index "plans_guidance_groups", ["plan_id"], name: "fk_rails_13d0671430", using: :btree
 
   create_table "question_formats", force: :cascade do |t|
     t.string   "title",        limit: 255
@@ -247,7 +251,7 @@
     t.datetime "updated_at"
   end
 
-  add_index "question_options", ["question_id"], name: "fk_rails_b9c5f61cf9"
+  add_index "question_options", ["question_id"], name: "fk_rails_b9c5f61cf9", using: :btree
 
   create_table "questions", force: :cascade do |t|
     t.text     "text",                   limit: 65535
@@ -261,16 +265,16 @@
     t.boolean  "modifiable"
   end
 
-  add_index "questions", ["question_format_id"], name: "fk_rails_4fbc38c8c7"
-  add_index "questions", ["section_id"], name: "index_questions_on_section_id"
+  add_index "questions", ["question_format_id"], name: "fk_rails_4fbc38c8c7", using: :btree
+  add_index "questions", ["section_id"], name: "index_questions_on_section_id", using: :btree
 
   create_table "questions_themes", id: false, force: :cascade do |t|
     t.integer "question_id", limit: 4, null: false
     t.integer "theme_id",    limit: 4, null: false
   end
 
-  add_index "questions_themes", ["question_id", "theme_id"], name: "question_theme_index"
-  add_index "questions_themes", ["theme_id", "question_id"], name: "theme_question_index"
+  add_index "questions_themes", ["question_id", "theme_id"], name: "question_theme_index", using: :btree
+  add_index "questions_themes", ["theme_id", "question_id"], name: "theme_question_index", using: :btree
 
   create_table "regions", force: :cascade do |t|
     t.string  "abbreviation",    limit: 255
@@ -287,8 +291,8 @@
     t.integer  "access",     limit: 4, default: 0, null: false
   end
 
-  add_index "roles", ["plan_id"], name: "fk_rails_a1ce6c2772"
-  add_index "roles", ["user_id"], name: "fk_rails_ab35d699f0"
+  add_index "roles", ["plan_id"], name: "fk_rails_a1ce6c2772", using: :btree
+  add_index "roles", ["user_id"], name: "fk_rails_ab35d699f0", using: :btree
 
   create_table "sections", force: :cascade do |t|
     t.string   "title",       limit: 255
@@ -301,7 +305,7 @@
     t.boolean  "modifiable"
   end
 
-  add_index "sections", ["phase_id"], name: "index_sections_on_phase_id"
+  add_index "sections", ["phase_id"], name: "index_sections_on_phase_id", using: :btree
 
   create_table "settings", force: :cascade do |t|
     t.string   "var",         limit: 255,   null: false
@@ -312,7 +316,7 @@
     t.datetime "updated_at",                null: false
   end
 
-  add_index "settings", ["target_type", "target_id", "var"], name: "index_settings_on_target_type_and_target_id_and_var", unique: true
+  add_index "settings", ["target_type", "target_id", "var"], name: "index_settings_on_target_type_and_target_id_and_var", unique: true, using: :btree
 
   create_table "splash_logs", force: :cascade do |t|
     t.string   "destination", limit: 255
@@ -337,8 +341,8 @@
     t.boolean  "dirty",                          default: false
   end
 
-  add_index "templates", ["org_id", "dmptemplate_id"], name: "template_organisation_dmptemplate_index"
-  add_index "templates", ["org_id"], name: "index_templates_on_org_id"
+  add_index "templates", ["org_id", "dmptemplate_id"], name: "template_organisation_dmptemplate_index", using: :btree
+  add_index "templates", ["org_id"], name: "index_templates_on_org_id", using: :btree
 
   create_table "themes", force: :cascade do |t|
     t.string   "title",       limit: 255
@@ -353,8 +357,8 @@
     t.integer "guidance_id", limit: 4
   end
 
-  add_index "themes_in_guidance", ["guidance_id"], name: "fk_rails_a5ab9402df"
-  add_index "themes_in_guidance", ["theme_id"], name: "fk_rails_7d708f6f1e"
+  add_index "themes_in_guidance", ["guidance_id"], name: "fk_rails_a5ab9402df", using: :btree
+  add_index "themes_in_guidance", ["theme_id"], name: "fk_rails_7d708f6f1e", using: :btree
 
   create_table "token_permission_types", force: :cascade do |t|
     t.string   "token_type",       limit: 255
@@ -371,8 +375,8 @@
     t.integer  "identifier_scheme_id", limit: 4
   end
 
-  add_index "user_identifiers", ["identifier_scheme_id"], name: "fk_rails_fe95df7db0"
-  add_index "user_identifiers", ["user_id"], name: "fk_rails_65c9a98cdb"
+  add_index "user_identifiers", ["identifier_scheme_id"], name: "fk_rails_fe95df7db0", using: :btree
+  add_index "user_identifiers", ["user_id"], name: "fk_rails_65c9a98cdb", using: :btree
 
   create_table "users", force: :cascade do |t|
     t.string   "firstname",              limit: 255
@@ -408,19 +412,57 @@
     t.string   "recovery_email",         limit: 255
   end
 
-  add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
-  add_index "users", ["email"], name: "index_users_on_email", unique: true
-  add_index "users", ["invitation_token"], name: "index_users_on_invitation_token", unique: true
-  add_index "users", ["language_id"], name: "fk_rails_45f4f12508"
-  add_index "users", ["org_id"], name: "fk_rails_e73753bccb"
-  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
+  add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree
+  add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
+  add_index "users", ["invitation_token"], name: "index_users_on_invitation_token", unique: true, using: :btree
+  add_index "users", ["language_id"], name: "fk_rails_45f4f12508", using: :btree
+  add_index "users", ["org_id"], name: "fk_rails_e73753bccb", using: :btree
+  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
 
   create_table "users_perms", id: false, force: :cascade do |t|
     t.integer "user_id", limit: 4
     t.integer "perm_id", limit: 4
   end
 
-  add_index "users_perms", ["perm_id"], name: "fk_rails_457217c31c"
-  add_index "users_perms", ["user_id", "perm_id"], name: "index_users_perms_on_user_id_and_perm_id"
+  add_index "users_perms", ["perm_id"], name: "fk_rails_457217c31c", using: :btree
+  add_index "users_perms", ["user_id", "perm_id"], name: "index_users_perms_on_user_id_and_perm_id", using: :btree
 
+  add_foreign_key "annotations", "orgs"
+  add_foreign_key "annotations", "questions"
+  add_foreign_key "answers", "plans"
+  add_foreign_key "answers", "questions"
+  add_foreign_key "answers", "users"
+  add_foreign_key "answers_question_options", "answers"
+  add_foreign_key "answers_question_options", "question_options"
+  add_foreign_key "guidance_groups", "orgs"
+  add_foreign_key "guidances", "guidance_groups"
+  add_foreign_key "notes", "answers"
+  add_foreign_key "notes", "users"
+  add_foreign_key "org_identifiers", "identifier_schemes"
+  add_foreign_key "org_identifiers", "orgs"
+  add_foreign_key "org_token_permissions", "orgs"
+  add_foreign_key "org_token_permissions", "token_permission_types"
+  add_foreign_key "orgs", "languages"
+  add_foreign_key "orgs", "regions"
+  add_foreign_key "phases", "templates"
+  add_foreign_key "plans", "templates"
+  add_foreign_key "plans_guidance_groups", "guidance_groups"
+  add_foreign_key "plans_guidance_groups", "plans"
+  add_foreign_key "question_options", "questions"
+  add_foreign_key "questions", "question_formats"
+  add_foreign_key "questions", "sections"
+  add_foreign_key "questions_themes", "questions"
+  add_foreign_key "questions_themes", "themes"
+  add_foreign_key "roles", "plans"
+  add_foreign_key "roles", "users"
+  add_foreign_key "sections", "phases"
+  add_foreign_key "templates", "orgs"
+  add_foreign_key "themes_in_guidance", "guidances"
+  add_foreign_key "themes_in_guidance", "themes"
+  add_foreign_key "user_identifiers", "identifier_schemes"
+  add_foreign_key "user_identifiers", "users"
+  add_foreign_key "users", "languages"
+  add_foreign_key "users", "orgs"
+  add_foreign_key "users_perms", "perms"
+  add_foreign_key "users_perms", "users"
 end