diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 008e253..c952b33 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -38,11 +38,12 @@
 
   def store_location
     # store last url - this is needed for post-login redirect to whatever the user last visited.
-    if (request.fullpath != "/users/sign_in" && \
-			 request.fullpath != "/users/sign_up" && \
-			 request.fullpath != "/users/password" && \
-            request.fullpath != "/users/sign_up?nosplash=true" && \
-			 !request.xhr?) # don't store ajax calls
+    unless ["/users/sign_in",
+            "/users/sign_up",
+            "/users/password",
+            "/users/invitation/accept",
+           ].any? { |ur| request.fullpath.include?(ur) } \
+    or request.xhr? # don't store ajax calls
       session[:previous_url] = request.fullpath
     end
   end
diff --git a/app/controllers/plans_controller.rb b/app/controllers/plans_controller.rb
index 6c3e73e..27cca0d 100644
--- a/app/controllers/plans_controller.rb
+++ b/app/controllers/plans_controller.rb
@@ -110,6 +110,7 @@
 
     @all_guidance_groups = @plan.get_guidance_group_options
     @selected_guidance_groups = @plan.guidance_groups.pluck(:id)
+    
 
     respond_to do |format|
       if @plan.save
@@ -130,7 +131,24 @@
     @plan = Plan.eager_load(params[:id])
     authorize @plan
     @editing = (!params[:editing].nil? && @plan.administerable_by?(current_user.id))
+
+    # Get all Guidance Groups applicable for the plan and group them by org
     @all_guidance_groups = @plan.get_guidance_group_options
+    @all_ggs_grouped_by_org = @all_guidance_groups.sort.group_by(&:org)
+
+    # Important ones come first on the page - we grab the user's org's GGs and "Organisation" org type GGs
+    @important_ggs = []
+    @important_ggs << [current_user.org, @all_ggs_grouped_by_org.delete(current_user.org)]
+    @all_ggs_grouped_by_org.each do |org, ggs|
+      if org.organisation? 
+        @important_ggs << [org,ggs] 
+        @all_ggs_grouped_by_org.delete(org)
+      end
+    end
+
+    # Sort the rest by org name for the accordion
+    @all_ggs_grouped_by_org = @all_ggs_grouped_by_org.sort_by {|org,gg| org.name}
+
     @selected_guidance_groups = @plan.guidance_groups.pluck(:id)
     @based_on = @plan.base_template
 
diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb
index d2419a8..5bbc856 100644
--- a/app/controllers/roles_controller.rb
+++ b/app/controllers/roles_controller.rb
@@ -3,6 +3,7 @@
   after_action :verify_authorized
 
   def create
+    registered = true
     @role = Role.new(role_params)
     authorize @role
     access_level = params[:role][:access_level].to_i
@@ -14,16 +15,17 @@
         message = _('User added to project')
         user = User.find_by(email: params[:user])
         if user.nil?
+          registered = false
           User.invite!(email: params[:user])
           message = _('Invitation issued successfully.')
           user = User.find_by(email: params[:user])
         end
         @role.user = user
         if @role.save
-          UserMailer.sharing_notification(@role, current_user).deliver
+          if registered then UserMailer.sharing_notification(@role, current_user).deliver_now end
           flash[:notice] = message
         else
-          flash[:notice] = generate_error_notice(@role, _('role'))
+          flash[:notice] = failed_create_error(@role, _('role'))
         end
       end
     else
@@ -40,10 +42,10 @@
     set_access_level(access_level)
     if @role.update_attributes(role_params)
       flash[:notice] = _('Sharing details successfully updated.')
-      UserMailer.permissions_change_notification(@role).deliver_now
+      UserMailer.permissions_change_notification(@role, current_user).deliver_now
       redirect_to controller: 'plans', action: 'share', id: @role.plan.id
     else
-      flash[:notice] = generate_error_notice(@role, _('role'))
+      flash[:notice] = failed_create_error(@role, _('role'))
       render action: "edit"
     end
   end
@@ -55,7 +57,7 @@
     plan = @role.plan
     @role.destroy
     flash[:notice] = _('Access removed')
-    UserMailer.project_access_removed_notification(user, plan).deliver_now
+    UserMailer.project_access_removed_notification(user, plan, current_user).deliver_now
     redirect_to controller: 'plans', action: 'share', id: @role.plan.id
   end
 
@@ -83,4 +85,4 @@
     end
   end
 
-end
\ No newline at end of file
+end
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 44efc03..f679ba2 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -18,17 +18,19 @@
     end
 	end
 	
-	def permissions_change_notification(role)
+	def permissions_change_notification(role, current_user)
 		@role = role
+                @current_user = current_user
 		FastGettext.with_locale FastGettext.default_locale do
       mail(to: @role.user.email, 
            subject: "#{_('Changed permissions on a DMP in')} #{Rails.configuration.branding[:application][:name]}")
     end
 	end
 	
-	def project_access_removed_notification(user, plan)
+	def project_access_removed_notification(user, plan, current_user)
 		@user = user
 		@plan = plan
+                @current_user = current_user
     FastGettext.with_locale FastGettext.default_locale do
   		mail(to: @user.email, 
            subject: "#{_('Permissions removed on a DMP in')} #{Rails.configuration.branding[:application][:name]}")
@@ -42,4 +44,4 @@
              subject: "#{_('API rights in')} #{Rails.configuration.branding[:application][:name]}")
       end
   end
-end
\ No newline at end of file
+end
diff --git a/app/models/guidance.rb b/app/models/guidance.rb
index dfec5dc..8ba321b 100644
--- a/app/models/guidance.rb
+++ b/app/models/guidance.rb
@@ -3,7 +3,7 @@
 #   This class keeps the information organisations enter to support users when answering questions.
 #   It always belongs to a guidance group class and it can be linked directly to a question or through one or more themes
 # [+Created:+] 07/07/2014
-# [+Copyright:+] Digital Curation Centre and University of California Curation Center
+# [+Copyright:+] Digital Curation Centre and California Digital Library
 
 
 
diff --git a/app/views/devise/mailer/invitation_instructions.html.erb b/app/views/devise/mailer/invitation_instructions.html.erb
index b3366dc..c7235c1 100644
--- a/app/views/devise/mailer/invitation_instructions.html.erb
+++ b/app/views/devise/mailer/invitation_instructions.html.erb
@@ -1,12 +1,8 @@
 <% FastGettext.with_locale FastGettext.default_locale do %>
-	<p><%= _("Hello") %> <%= @resource.email %>!</p>
+<p><%= _("Hello") %> <%= @resource.email %>,</p>
+<p><%= _("A colleague has invited you to contribute to their Data Management Plan at ") %> <%= link_to Rails.configuration.branding[:application][:name], root_url %>.</p>
+<p><%= link_to _("Click here to accept the invitation"), accept_invitation_url(@resource, :invitation_token => @token) %> (<%= _("or copy") %> <%= accept_invitation_url(@resource, :invitation_token => @token) %> <%= _("into your browser") %>).</p>
+<p><%= _("If you don't want to accept the invitation, please ignore this email.") %><br /><%= _("Your account won't be created until you access the link above and set your password.") %></p>
+<p><%=_('All the best,')%><br /><%= _('The ')%><%= Rails.configuration.branding[:application][:name] %><%=_(' team')%>.</p>
 
-	<p><%= _("A colleague has invited you to contribute to their Data Management Plan at ") %> <%= link_to Rails.configuration.branding[:application][:name], root_url %></p>
-
-	<p><%= link_to _("Click here to accept the invitation"), accept_invitation_url(@resource, :invitation_token => @token) %> (<%= _("or copy") %> <%= accept_invitation_url(@resource, :invitation_token => @token) %> <%= _("into your browser") %>).</p>
-
-	<p>
-		<%= _("If you don't want to accept the invitation, please ignore this email.") %><br />
-    <%= _("Your account won't be created until you access the link above and set your password.") %>
-	</p>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 897d824..14cca4f 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -14,8 +14,8 @@
     	</div>
     </div>	
    	<div class="right_side_footer">
-   		<p><%= link_to( image_tag("dcc_logo.png"), "http://www.dcc.ac.uk/")%>
-   			<%= link_to( image_tag("uc3_logo.jpg", class: "footer_logo"), "http://www.cdlib.org/uc3/", id: "footer_right_uc3") %></p>
+   		<p><%= link_to( image_tag("dcc_logo.png"),                       "http://www.dcc.ac.uk/",     title: "Digital Curation Centre", ) %>
+                   <%= link_to( image_tag("uc3_logo.jpg", class: "footer_logo"), "http://www.cdlib.org/uc3/", title: "California Digital Library", id: "footer_right_uc3", ) %></p>
    	</div>	
     
 </footer>
@@ -40,4 +40,4 @@
 		</div>
 	</div>
 
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/phases/_answer.html.erb b/app/views/phases/_answer.html.erb
index 24cf732..1b3106c 100644
--- a/app/views/phases/_answer.html.erb
+++ b/app/views/phases/_answer.html.erb
@@ -2,7 +2,7 @@
   **Project: DMPRoadmap
   **Description: this partial renders an answer when there is a conflict.
   **Arguments transferred: question, answer
-  **Copyright: Digital Curation Centre and University of California Curation Center
+  **Copyright: Digital Curation Centre and California Digital Library
 -->
 
 <% qformat = question.question_format %>
diff --git a/app/views/phases/_answer_form.html.erb b/app/views/phases/_answer_form.html.erb
index e14ec26..85be632 100644
--- a/app/views/phases/_answer_form.html.erb
+++ b/app/views/phases/_answer_form.html.erb
@@ -2,7 +2,7 @@
   **Project: DMPRoadmap
   **Description: This block sets up the type of question, its guidance.
   **Arguments transferred: an instance of "question"
-  **Copyright: Digital Curation Centre and University of California Curation Center
+  **Copyright: Digital Curation Centre and California Digital Library
 -->
 
 <div class="question-div">
diff --git a/app/views/phases/_answer_form_ro.html.erb b/app/views/phases/_answer_form_ro.html.erb
index 674cc29..4f68019 100644
--- a/app/views/phases/_answer_form_ro.html.erb
+++ b/app/views/phases/_answer_form_ro.html.erb
@@ -2,7 +2,7 @@
   **Project: DMPRoadmap
   **Description: This block sets up the type of question, its guidance.
   **Arguments transferred: an instance of "question"
-  **Copyright: Digital Curation Centre and University of California Curation Center
+  **Copyright: Digital Curation Centre and California Digital Library
 -->
 <% answer = @plan.answer(question.id) %>
 
diff --git a/app/views/plans/_answer_form.html.erb b/app/views/plans/_answer_form.html.erb
index 1d17c20..b53e013 100644
--- a/app/views/plans/_answer_form.html.erb
+++ b/app/views/plans/_answer_form.html.erb
@@ -2,7 +2,7 @@
 **Project: DMPRoadmap
 **Description: This block sets up the type of question, its guidance.
 **Arguments transferred: an instance of "question"
-**Copyright: Digital Curation Centre and University of California Curation Center
+**Copyright: Digital Curation Centre and California Digital Library
 -->
 <% answer = @plan.answer(question.id) %>
 
diff --git a/app/views/plans/_answer_form_ro.html.erb b/app/views/plans/_answer_form_ro.html.erb
index c2837a9..e035e1c 100644
--- a/app/views/plans/_answer_form_ro.html.erb
+++ b/app/views/plans/_answer_form_ro.html.erb
@@ -2,7 +2,7 @@
 **Project: DMPRoadmap
 **Description: This block sets up the type of question, its guidance.
 **Arguments transferred: an instance of "question"
-**Copyright: Digital Curation Centre and University of California Curation Center
+**Copyright: Digital Curation Centre and California Digital Library
 -->
 <% answer = @plan.answer(question.id) %>
 
diff --git a/app/views/plans/_plan_details.html.erb b/app/views/plans/_plan_details.html.erb
index 2817e20..03f5f0b 100644
--- a/app/views/plans/_plan_details.html.erb
+++ b/app/views/plans/_plan_details.html.erb
@@ -164,35 +164,69 @@
 
 
   <!-- Selection of guidance groups -->
+  <%= form_tag( update_guidance_choices_plan_path(@plan), method: :put) do %>
+  <div id="plan-guidance-important">
+      <h3>Guidance Choices</h3>
+      <table id="dmp_table" class="dmp_table tablesorter">
+      <tbody>
+          <% @important_ggs.each do |org, groups| %>                                                                                                                                                                  
+              <tr>
+              <td class="dmp_td_medium">
+                  <% if groups && groups.size == 1 %>
+                      <%= check_box_tag "guidance_group_ids[]", groups[0].id, @selected_guidance_groups.include?(groups[0].id) %>
+                      <%= org.name %>
+                  <% elsif groups %>
+                      <input type="checkbox" disabled> <%= org.name %>
+                      <% groups.each do |group| %>
+                          <tr><td class="dmp_td_small">
+                              └─ <%= check_box_tag "guidance_group_ids[]", group.id, @selected_guidance_groups.include?(group.id) %>
+                              <%= group.name %>
+                          </td></tr>
+                      <% end %>
+                  <% end %>
+              </td>
+              </tr>
+          <% end %>
+      </tbody>
+      </table>
+  </div>
   <div class="accordion" id="plan-guidance-accordion">
       <div class="accordion-group">
           <div class="accordion-heading">
               <a class="accordion-toggle" data-toggle="collapse" data-parent="#plan-guidance-accordion" href="#guidance-choices">
-                  <h3>Guidance Choices<span class="plus-laranja"> </span></h3>
+                  <h3><%=_('Other institutions')%><span class="plus-laranja"> </span></h3>
               </a>
           </div>
           <div id="guidance-choices" class="accordion-project collapse">
-              <div class="accordion-inner">
-                <%= form_tag( update_guidance_choices_plan_path(@plan), method: :put) do %>
-                  <table id="dmp_table" class="dmp_table tablesorter">
-                    <tbody>
-                        <% all_guidance_groups.each do |group| %>
-                          <tr>
-                          <td class="dmp_td_medium">
-                            <%= check_box_tag "guidance_group_ids[]", group.id, @selected_guidance_groups.include?(group.id) %>
-                            <%= group.name %>
-                          </td>
-                          </tr> 
-                        <% end %>
-                      </tr>
-                    </tbody>
-                  </table>
-                  <%= submit_tag _('Save'), class: "btn btn-primary"%>
-                <% end %>
+                  <div class="accordion-inner">
+                      <table id="other_ggs_table" class="dmp_table tablesorter">
+                      <tbody>
+                          <% @all_ggs_grouped_by_org.each do |org, groups| %>
+                              <tr>
+                              <td class="dmp_td_medium">
+                                  <% if groups && groups.size == 1 %>
+                                      <%= check_box_tag "guidance_group_ids[]", groups[0].id, @selected_guidance_groups.include?(groups[0].id) %>
+                                      <%= org.name %>
+                                  <% elsif groups %>
+                                      <input type="checkbox" disabled> <%= org.name %>
+                                      <% groups.each do |group| %>
+                                          <tr><td class="dmp_td_small">
+                                              └─ <%= check_box_tag "guidance_group_ids[]", group.id, @selected_guidance_groups.include?(group.id) %>
+                                              <%= group.name %>
+                                          </td></tr>
+                                      <% end %>
+                                  <% end %>
+                              </td>
+                              </tr>
+                          <% end %>
+                      </tbody>
+                      </table>               
+                  </div>
               </div>
           </div>
       </div>
-  </div>
+      <%= submit_tag _('Save'), class: "btn btn-primary"%>
+  <% end %>
 
   <div class="div_clear"></div>
 
@@ -319,3 +353,4 @@
 			<%end%><!-- end of phases.each
 		<%end%> <!-- end of if phases.count == 1 -->
 </div>
+
diff --git a/app/views/questions/_add_question.html.erb b/app/views/questions/_add_question.html.erb
index cbd0207..3a95f58 100644
--- a/app/views/questions/_add_question.html.erb
+++ b/app/views/questions/_add_question.html.erb
@@ -3,7 +3,7 @@
 **Description: This block displays adding a new question, its guidance, and options when multiple choice is selected
 in the admin interface.
 **Arguments transferred: an instance of 'section'
-**Copyright: Digital Curation Centre and University of California Curation Center
+**Copyright: Digital Curation Centre and California Digital Library
 -->
 
 <% @new_question = Question.new %>
diff --git a/app/views/questions/_edit_question.html.erb b/app/views/questions/_edit_question.html.erb
index d416548..6c3d573 100644
--- a/app/views/questions/_edit_question.html.erb
+++ b/app/views/questions/_edit_question.html.erb
@@ -3,7 +3,7 @@
 **Description: This block displays editing a question, its guidance, and options when multiple choice is selected
 in the admin interface.
 **Arguments transferred: an instance of 'question'
-**Copyright: Digital Curation Centre and University of California Curation Center
+**Copyright: Digital Curation Centre and California Digital Library
 -->
 
 <%= form_for(question, url: admin_update_question_path(question), html: { method: :put}) do |f| %>
diff --git a/app/views/questions/_show_question.html.erb b/app/views/questions/_show_question.html.erb
index e690b14..754d330 100644
--- a/app/views/questions/_show_question.html.erb
+++ b/app/views/questions/_show_question.html.erb
@@ -2,7 +2,7 @@
 **Project: DMPRoadmap
 **Description: This block shows a question, its guidance, and options when multiple choice is selected.
 **Arguments transferred: 'question'
-**Copyright: Digital Curation Centre and University of California Curation Center
+**Copyright: Digital Curation Centre and California Digital Library
 -->
 
 <div class="question-div">
diff --git a/app/views/sections/_edit_section.html.erb b/app/views/sections/_edit_section.html.erb
index 59d8865..60425dd 100644
--- a/app/views/sections/_edit_section.html.erb
+++ b/app/views/sections/_edit_section.html.erb
@@ -2,7 +2,7 @@
 **Project: DMPRoadmap
 **Description: This block edits a section and its questions.
 **Arguments transferred: 'section'
-**Copyright: Digital Curation Centre and University of California Curation Center
+**Copyright: Digital Curation Centre and California Digital Library
 -->
 
 
diff --git a/app/views/templates/_edit_annotations.html.erb b/app/views/templates/_edit_annotations.html.erb
index 020ce5c..96e7708 100644
--- a/app/views/templates/_edit_annotations.html.erb
+++ b/app/views/templates/_edit_annotations.html.erb
@@ -3,7 +3,7 @@
 **Description: This block displays editing a question, its guidance, and options when multiple choice is selected
 in the admin interface.
 **Arguments transferred: an instance of 'question'
-**Copyright: Digital Curation Centre and University of California Curation Center
+**Copyright: Digital Curation Centre and California Digital Library
 -->
 
 <%= form_for(question, url: admin_update_question_path(question), html: { method: :put}) do |f| %>
diff --git a/app/views/user_mailer/permissions_change_notification.html.erb b/app/views/user_mailer/permissions_change_notification.html.erb
index 2ba3df7..5bd0bfd 100644
--- a/app/views/user_mailer/permissions_change_notification.html.erb
+++ b/app/views/user_mailer/permissions_change_notification.html.erb
@@ -1,7 +1,5 @@
 <% FastGettext.with_locale FastGettext.default_locale do %>
-  <p><%= _('Hello ') %><%= @role.user.name %></p>
-
-  <% 
+<% 
   access_level = "read-only"
   permissions = "This means you can read the plan and leave comments."
   if @role.editor?
@@ -12,13 +10,9 @@
     access_level = "co-owner"
     permissions = "This means you can write and edit the plan in a collaborative manner. You can also grant rights to other collaborators."
   end
-  %>
+%>
+<p><%= _('Hello ') %><%= @role.user.name %>,</p>
+<p><%= _('Your permissions relating to ') %> "<%= link_to @role.plan.title, url_for(action: 'show', controller: 'plans', id: @role.plan.id, locale: FastGettext.default_locale) %>" <%= _(' have been changed by') %><%="#{@current_user.firstname} #{@current_user.surname}. " %><%= _('You now have ') %><%= access_level %><%= _(' access. ') %><%= permissions %></p>
+<p><%=_('All the best,')%><br /><%= _('The ')%><%= Rails.configuration.branding[:application][:name] %><%=_(' team')%>.</p>
 
-  <p><%= _('Your permissions relating to ') %>"<%= link_to @role.plan.title, url_for(action: 'show', controller: 'plans', id: @role.plan.id, locale: I18n.default_locale) %>"<%= _(' have changed. You now have ') %><%= access_level %><%= _(' access. ')%><%= permissions %></p>
-  
-  <p>
-    <%=_('All the best,')%>
-    <br />
-    <%= _('The ')%><%= Rails.configuration.branding[:application][:name] %><%=_(' team')%>.
-  </p>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/user_mailer/project_access_removed_notification.html.erb b/app/views/user_mailer/project_access_removed_notification.html.erb
index 4c74c21..63ec8d9 100644
--- a/app/views/user_mailer/project_access_removed_notification.html.erb
+++ b/app/views/user_mailer/project_access_removed_notification.html.erb
@@ -1,11 +1,6 @@
 <% FastGettext.with_locale FastGettext.default_locale do %>
-	<p><%= _('Hello ') %><%= @user.email %></p>
+<p><%= _('Hello ') %><%= @user.email %>,</p>
+<p><%= _('Your access to ') %>"<%= @plan.title %>"<%= _(' has been removed by ') %><%= "#{@current_user.firstname} #{@current_user.surname}"%>.</p>
+<p><%=_('All the best,')%><br /><%= _('The ')%><%= Rails.configuration.branding[:application][:name] %><%=_(' team')%>.</p>
 
-	<p><%= _('Your access to ') %>"<%= @plan.title %>"<%= _(' has been removed by ') %><%= @user.email %>.</p>
-	
-  <p>
-    <%=_('All the best,')%>
-    <br />
-    <%= _('The ')%><%= Rails.configuration.branding[:application][:name] %><%=_(' team')%>.
-  </p>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/user_mailer/sharing_notification.html.erb b/app/views/user_mailer/sharing_notification.html.erb
index c96e029..95ee5b1 100644
--- a/app/views/user_mailer/sharing_notification.html.erb
+++ b/app/views/user_mailer/sharing_notification.html.erb
@@ -1,17 +1,22 @@
 <% FastGettext.with_locale FastGettext.default_locale do %>
-  <p><%= _('Hello ') %><%= @role.user.name %></p>
+<% 
+  access_level = "read-only"
+  permissions = "This means you can read the plan and leave comments."
+  if @role.editor?
+    access_level = "editor"
+    permissions = "This means you can write and edit the plan in a collaborative manner."
+  end
+  if @role.administrator?
+    access_level = "co-owner"
+    permissions = "This means you can write and edit the plan in a collaborative manner. You can also grant rights to other collaborators."
+  end
+%>
+<p><%= _('Hello ') %><%= @role.user.name %>,</p>
+<p><%= _('A colleague has invited you to contribute to their Data Management Plan at ') %><%= link_to Rails.configuration.branding[:application][:name], root_url %>.</p>
+<p><%= _('You have been given ') %><%= access_level %><%= _(' access to') %> "<%= link_to @role.plan.title, url_for(action: 'show', controller: 'plans', id: @role.plan.id, locale: FastGettext.default_locale) %>" <%=_(' by ')%><%= "#{@user.firstname} #{@user.surname}"%>.</p>
+<p><%= link_to _('Click here'), url_for(action: 'show', controller: 'plans', id: @role.plan.id, locale: FastGettext.default_locale) %><%= _(' to accept the invitation, (or copy ') %><%= url_for(action: 'show', controller: 'plans', id: @role.plan.id, locale: FastGettext.default_locale) %><%= _(' into your browser)')%></p>
+<p><%= _('If you don\'t want to accept the invitation, please ignore this email.') %></p>
+<p><%=_('All the best,')%><br /><%= _('The ')%><%= Rails.configuration.branding[:application][:name] %><%=_(' team')%>.</p>
 
-  <p><%= _('A colleague has invited you to contribute to their Data Management Plan at ') %><%=Rails.configuration.branding[:application][:name]%></p>
-
-	<p><%= _('You have been given ') %><%= @access_level %><%= _(' access to') %>"<%= link_to @role.plan.title, url_for(action: 'show', controller: 'plans', id: @role.plan.id, locale: FastGettext.default_locale) %>" <%=_(' by ')%><%= @user.firstname %>.</p>
-
-  <p><%= link_to _('Click here'), url_for(action: 'show', controller: 'plans', id: @role.plan.id, locale: FastGettext.default_locale) %><%= _(' to accept the invitation, (or copy ') %><%= url_for(action: 'show', controller: 'plans', id: @role.plan.id, locale: FastGettext.default_locale) %><%= _(' into your browser)')%> 
-
-  <p><%= _('If you don\'t want to accept the invitation, please ignore this email.') %></p>
-
-  <p>
-    <%=_('All the best,')%>
-    <br />
-    <%= _('The ')%><%= Rails.configuration.branding[:application][:name] %><%=_(' team')%>.
-  </p>
 <% end %>
+
diff --git a/config/application.rb b/config/application.rb
index bae1b99..9dbff4e 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -86,10 +86,10 @@
     # Enable shibboleth as an alternative authentication method
     # Requires server configuration and omniauth shibboleth provider configuration
     # See config/initializers/omniauth.rb
-    config.shibboleth_enabled = false
+    config.shibboleth_enabled = true
 
     # Absolute path to Shibboleth SSO Login
-    config.shibboleth_login = 'https://localhost/Shibboleth.sso/Login'
+    config.shibboleth_login = '/Shibboleth.sso/Login'
     
     # Active Record will no longer suppress errors raised in after_rollback or after_commit
     # in the next version. Devise appears to be using those callbacks.
diff --git a/config/initializers/contac_us_example.rb b/config/initializers/contac_us_example.rb
deleted file mode 100644
index 0d3b4f6..0000000
--- a/config/initializers/contac_us_example.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# Use this hook to configure contact mailer.
-ContactUs.setup do |config|
-
-  # ==> Mailer Configuration
-
-  # Configure the e-mail address which email notifications should be sent from.  If emails must be sent from a verified email address you may set it here.
-  # Example:
-  # config.mailer_from = "contact@please-change-me.com"
-  config.mailer_from = nil
-
-  # Configure the e-mail address which should receive the contact form email notifications.
-  config.mailer_to = "example@email.address"
-
-  # ==> Form Configuration
-
-  # Configure the form to ask for the users name.
-  config.require_name = true
-
-  # Configure the form to ask for a subject.
-  config.require_subject = true
-
-  # Configure the form gem to use.
-  # Example:
-  # config.form_gem = 'formtastic
-  # config.form_gem = 'formtastic'
-
-end
diff --git a/config/initializers/contact_us.rb.example b/config/initializers/contact_us.rb.example
new file mode 100644
index 0000000..0d3b4f6
--- /dev/null
+++ b/config/initializers/contact_us.rb.example
@@ -0,0 +1,27 @@
+# Use this hook to configure contact mailer.
+ContactUs.setup do |config|
+
+  # ==> Mailer Configuration
+
+  # Configure the e-mail address which email notifications should be sent from.  If emails must be sent from a verified email address you may set it here.
+  # Example:
+  # config.mailer_from = "contact@please-change-me.com"
+  config.mailer_from = nil
+
+  # Configure the e-mail address which should receive the contact form email notifications.
+  config.mailer_to = "example@email.address"
+
+  # ==> Form Configuration
+
+  # Configure the form to ask for the users name.
+  config.require_name = true
+
+  # Configure the form to ask for a subject.
+  config.require_subject = true
+
+  # Configure the form gem to use.
+  # Example:
+  # config.form_gem = 'formtastic
+  # config.form_gem = 'formtastic'
+
+end
diff --git a/config/locale/app.pot b/config/locale/app.pot
index def014e..3930575 100644
--- a/config/locale/app.pot
+++ b/config/locale/app.pot
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: app 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-05-08 16:51+0100\n"
-"PO-Revision-Date: 2017-05-08 16:51+0100\n"
+"POT-Creation-Date: 2017-05-12 15:25+0100\n"
+"PO-Revision-Date: 2017-05-12 15:25+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -42,6 +42,9 @@
 msgid " access to"
 msgstr ""
 
+msgid " access. "
+msgstr ""
+
 msgid " by"
 msgstr ""
 
@@ -51,7 +54,7 @@
 msgid " has been removed by "
 msgstr ""
 
-msgid " have changed. "
+msgid " have been changed by"
 msgstr ""
 
 msgid " into your browser)"
@@ -840,6 +843,9 @@
 msgid "Original funder template has changed!"
 msgstr ""
 
+msgid "Other institutions"
+msgstr ""
+
 msgid "Otherwise leave blank."
 msgstr ""
 
@@ -1386,6 +1392,9 @@
 msgid "You need to sign in or sign up before continuing."
 msgstr ""
 
+msgid "You now have "
+msgstr ""
+
 msgid "Your"
 msgstr ""
 
@@ -1452,6 +1461,9 @@
 msgid "activerecord.errors.models.user.attributes.password.blank"
 msgstr ""
 
+msgid "activerecord.errors.models.user.attributes.password_confirmation.confirmation"
+msgstr ""
+
 msgid "add guidance text"
 msgstr ""
 
diff --git a/config/locale/de/app.po b/config/locale/de/app.po
index f7a75fc..36ef44b 100644
--- a/config/locale/de/app.po
+++ b/config/locale/de/app.po
@@ -45,6 +45,9 @@
 msgid " access to"
 msgstr ""
 
+msgid " access. "
+msgstr ""
+
 #, fuzzy
 msgid " by"
 msgstr " von "
@@ -56,8 +59,9 @@
 msgid " has been removed by "
 msgstr " von "
 
-msgid " have changed. "
-msgstr ""
+#, fuzzy
+msgid " have been changed by"
+msgstr " von "
 
 #, fuzzy
 msgid " into your browser)"
@@ -869,6 +873,9 @@
 msgid "Original funder template has changed!"
 msgstr "templates"
 
+msgid "Other institutions"
+msgstr ""
+
 msgid "Otherwise leave blank."
 msgstr "Falls nicht, lassen Sie dieses Feld bitte unberührt."
 
@@ -1430,6 +1437,9 @@
 msgid "You need to sign in or sign up before continuing."
 msgstr "Bitte loggen Sie sich ein oder melden Sie sich fortsetzen."
 
+msgid "You now have "
+msgstr ""
+
 #, fuzzy
 msgid "Your"
 msgstr "Your "
@@ -1507,6 +1517,10 @@
 msgid "activerecord.errors.models.user.attributes.password.blank"
 msgstr "user"
 
+#, fuzzy
+msgid "activerecord.errors.models.user.attributes.password_confirmation.confirmation"
+msgstr "user"
+
 msgid "add guidance text"
 msgstr "add guidance text"
 
diff --git a/config/locale/en_GB/app.po b/config/locale/en_GB/app.po
index 276a045..26f3a5d 100644
--- a/config/locale/en_GB/app.po
+++ b/config/locale/en_GB/app.po
@@ -40,6 +40,10 @@
 msgid " access to"
 msgstr " access to"
 
+#, fuzzy
+msgid " access. "
+msgstr " access to"
+
 msgid " by"
 msgstr " by"
 
@@ -49,8 +53,9 @@
 msgid " has been removed by "
 msgstr " has been removed by "
 
-msgid " have changed. "
-msgstr " have changed. "
+#, fuzzy
+msgid " have been changed by"
+msgstr " by"
 
 msgid " into your browser)"
 msgstr " into your browser)."
@@ -169,7 +174,6 @@
 msgid "<p>Please note that your email address is used as your username. If you change this, remember to use your new email address on sign in.</p>"
 msgstr "<p>Please note that your email address is used as your username. If you change this, remember to use your new email address on sign in.</p>"
 
-
 msgid "<p>Please select from the following drop-down so we can determine what questions and guidance should be displayed in your plan.</p>"
 msgstr "<p>Please select from the following drop-down so we can determine what questions and guidance should be displayed in your plan.</p>"
 
@@ -839,6 +843,9 @@
 msgid "Original funder template has changed!"
 msgstr "Original funder template has changed!"
 
+msgid "Other institutions"
+msgstr ""
+
 msgid "Otherwise leave blank."
 msgstr "Otherwise leave blank."
 
@@ -1385,6 +1392,9 @@
 msgid "You need to sign in or sign up before continuing."
 msgstr "You need to sign in or sign up before continuing."
 
+msgid "You now have "
+msgstr ""
+
 msgid "Your"
 msgstr "Your"
 
@@ -1451,6 +1461,9 @@
 msgid "activerecord.errors.models.user.attributes.password.blank"
 msgstr "can't be blank"
 
+msgid "activerecord.errors.models.user.attributes.password_confirmation.confirmation"
+msgstr "passwords must match"
+
 msgid "add guidance text"
 msgstr "add guidance text"
 
diff --git a/config/locale/en_US/app.po b/config/locale/en_US/app.po
index 99f6bcc..078709c 100644
--- a/config/locale/en_US/app.po
+++ b/config/locale/en_US/app.po
@@ -40,6 +40,10 @@
 msgid " access to"
 msgstr " access to"
 
+#, fuzzy
+msgid " access. "
+msgstr " access to"
+
 msgid " by"
 msgstr " by"
 
@@ -49,8 +53,9 @@
 msgid " has been removed by "
 msgstr " has been removed by "
 
-msgid " have changed. "
-msgstr " have changed. "
+#, fuzzy
+msgid " have been changed by"
+msgstr " by"
 
 msgid " into your browser)"
 msgstr " into your browser)."
@@ -838,6 +843,9 @@
 msgid "Original funder template has changed!"
 msgstr "Original funder template has changed!"
 
+msgid "Other institutions"
+msgstr ""
+
 msgid "Otherwise leave blank."
 msgstr "Otherwise leave blank."
 
@@ -1384,6 +1392,9 @@
 msgid "You need to sign in or sign up before continuing."
 msgstr "You need to sign in or sign up before continuing."
 
+msgid "You now have "
+msgstr ""
+
 msgid "Your"
 msgstr "Your"
 
@@ -1450,6 +1461,9 @@
 msgid "activerecord.errors.models.user.attributes.password.blank"
 msgstr "can't be blank"
 
+msgid "activerecord.errors.models.user.attributes.password_confirmation.confirmation"
+msgstr "passwords must match"
+
 msgid "add guidance text"
 msgstr "add guidance text"
 
diff --git a/config/locale/es/app.po b/config/locale/es/app.po
index 514f582..debb763 100644
--- a/config/locale/es/app.po
+++ b/config/locale/es/app.po
@@ -42,6 +42,9 @@
 msgid " access to"
 msgstr ""
 
+msgid " access. "
+msgstr ""
+
 #, fuzzy
 msgid " by"
 msgstr " por "
@@ -53,8 +56,9 @@
 msgid " has been removed by "
 msgstr " por "
 
-msgid " have changed. "
-msgstr ""
+#, fuzzy
+msgid " have been changed by"
+msgstr " por "
 
 msgid " into your browser)"
 msgstr ""
@@ -861,6 +865,9 @@
 msgid "Original funder template has changed!"
 msgstr "templates"
 
+msgid "Other institutions"
+msgstr ""
+
 msgid "Otherwise leave blank."
 msgstr "Si no, déjelo en blanco."
 
@@ -1418,6 +1425,9 @@
 msgid "You need to sign in or sign up before continuing."
 msgstr ""
 
+msgid "You now have "
+msgstr ""
+
 msgid "Your"
 msgstr ""
 
@@ -1489,6 +1499,10 @@
 msgid "activerecord.errors.models.user.attributes.password.blank"
 msgstr "user"
 
+#, fuzzy
+msgid "activerecord.errors.models.user.attributes.password_confirmation.confirmation"
+msgstr "user"
+
 msgid "add guidance text"
 msgstr ""
 
diff --git a/config/locale/fr/app.po b/config/locale/fr/app.po
index 24df940..c41d966 100644
--- a/config/locale/fr/app.po
+++ b/config/locale/fr/app.po
@@ -42,6 +42,9 @@
 msgid " access to"
 msgstr ""
 
+msgid " access. "
+msgstr ""
+
 #, fuzzy
 msgid " by"
 msgstr " par "
@@ -53,8 +56,9 @@
 msgid " has been removed by "
 msgstr " par "
 
-msgid " have changed. "
-msgstr ""
+#, fuzzy
+msgid " have been changed by"
+msgstr " par "
 
 msgid " into your browser)"
 msgstr ""
@@ -859,6 +863,9 @@
 msgid "Original funder template has changed!"
 msgstr "templates"
 
+msgid "Other institutions"
+msgstr ""
+
 msgid "Otherwise leave blank."
 msgstr "Sinon laissez ce champ vide."
 
@@ -1415,6 +1422,9 @@
 msgid "You need to sign in or sign up before continuing."
 msgstr ""
 
+msgid "You now have "
+msgstr ""
+
 msgid "Your"
 msgstr ""
 
@@ -1486,6 +1496,10 @@
 msgid "activerecord.errors.models.user.attributes.password.blank"
 msgstr "user"
 
+#, fuzzy
+msgid "activerecord.errors.models.user.attributes.password_confirmation.confirmation"
+msgstr "user"
+
 msgid "add guidance text"
 msgstr ""
 
diff --git a/config/locale/i18n_placeholders.rb b/config/locale/i18n_placeholders.rb
index 532b25f..6b4d094 100644
--- a/config/locale/i18n_placeholders.rb
+++ b/config/locale/i18n_placeholders.rb
@@ -7,4 +7,6 @@
 #msgstr "can't be blank"
 _("activerecord.errors.models.user.attributes.password.blank")
 #msgstr "can't be blank"
+_("activerecord.errors.models.user.attributes.password_confirmation.confirmation")
+#msgstr "passwords must match"
 
diff --git a/lib/assets/javascripts/admin.js b/lib/assets/javascripts/admin.js
index 62b2b77..5997e27 100644
--- a/lib/assets/javascripts/admin.js
+++ b/lib/assets/javascripts/admin.js
@@ -2,7 +2,7 @@
 /*
 **Project: DMPRoadmap
 **Description: This file include all javascript regarding admin interface
-**Copyright: Digital Curation Centre and University of California Curation Center
+**Copyright: Digital Curation Centre and California Digital Library
 */