diff --git a/app/views/cafe_workers/_form.html.erb b/app/views/cafe_workers/_form.html.erb
index 5ed7aa31c..fd1c74ab3 100644
--- a/app/views/cafe_workers/_form.html.erb
+++ b/app/views/cafe_workers/_form.html.erb
@@ -12,8 +12,14 @@
   <%= f.input :group %>
   <%= f.button :submit %>
   <% if cafe_shift.cafe_worker.persisted? %>
-    <%= link_to(t('.destroy'),
-                cafe_shift_cafe_worker_path(cafe_shift, cafe_shift.cafe_worker),
-                method: :delete, class: 'btn danger pull-right') %>
+    <!-- if the cafe-shift is close to closing (12:00 the day before), don't allow the user to unsign from the shift -->
+    <% if (cafe_shift.start - 1.day).change(hour: 12) < Time.now %>
+      <%= t('.cant_unsign') %>
+      <%= t('.contact_head_of_cafe') %>
+    <% else %>
+      <%= link_to(t('.destroy'),
+                  cafe_shift_cafe_worker_path(cafe_shift, cafe_shift.cafe_worker),
+                  method: :delete, class: 'btn danger pull-right') %>
+    <% end %>
   <% end %>
 <% end %>
diff --git a/app/views/proposals/form.html.erb b/app/views/proposals/form.html.erb
index caac5653e..e84ddaad3 100644
--- a/app/views/proposals/form.html.erb
+++ b/app/views/proposals/form.html.erb
@@ -8,6 +8,7 @@
 <div class="col-md-offset-1 col-md-10 col-sm-12">
   <%= simple_format(t('.i_am_proposal_machine')) %>
   <%= simple_format(t('.do_not_forget_to_copy')) %>
+  <%= simple_format(t('.do_not_forget_to_send')) %>
 
   <%= form_for(@proposal, url: proposals_generate_path(format: :pdf),
                           html: {class: 'proposal-form'}) do |f| %>
diff --git a/config/locales/onesky_en/cafe_workers.en.yml b/config/locales/onesky_en/cafe_workers.en.yml
index a4bd1ea5a..51d8717bb 100644
--- a/config/locales/onesky_en/cafe_workers.en.yml
+++ b/config/locales/onesky_en/cafe_workers.en.yml
@@ -7,4 +7,6 @@
 en:
   cafe_workers:
     form:
-      destroy: "Resign from shift"
\ No newline at end of file
+      destroy: "Resign from shift"
+      cant_unsign: "You sadly can't resign from this shift as it is too close to the starting time of this shift (12 am the day before)"
+      contact_head_of_cafe: "If you really need to resign from this shift, write to the Head of the Cafe at cafe@fsektionen.se"
diff --git a/config/locales/onesky_en/proposals.en.yml b/config/locales/onesky_en/proposals.en.yml
index fe9fbb455..ab8af6a45 100644
--- a/config/locales/onesky_en/proposals.en.yml
+++ b/config/locales/onesky_en/proposals.en.yml
@@ -11,6 +11,7 @@ en:
       create_motion: "Create proposal!"
       description: "Motioner skrivs till terminsmöte för att kunna påverka sektionens verksamhet. Här finns en mall för att skapa motioner."
       do_not_forget_to_copy: "Do not forget to copy your text every now and then so that it doesn't disappear, were you to reload the page."
+      do_not_forget_to_find: "Observe that you still have to send your proposal to to the secretary (at sekreterare@fsektionen.se)."
       i_am_proposal_machine: "I am a proposal machine. Here, you can easily enter your opinions and I'll make a nice proposal for you."
       keywords:
         - motion
@@ -20,4 +21,4 @@ en:
       plea_less: "Plea less!"
       plea_more: "Plea more!"
       pleas: Pleas
-      title: "Proposal machine"
\ No newline at end of file
+      title: "Proposal machine"
diff --git a/config/locales/views/cafe_workers/cafe_workers.sv.yml b/config/locales/views/cafe_workers/cafe_workers.sv.yml
index 80f80fdfe..ee3cf0fe2 100644
--- a/config/locales/views/cafe_workers/cafe_workers.sv.yml
+++ b/config/locales/views/cafe_workers/cafe_workers.sv.yml
@@ -2,3 +2,5 @@ sv:
   cafe_workers:
     form:
       destroy: Hoppa av passet
+      cant_unsign: Du kan tyvärr inte avregistera dig från det här passet då det är för nära starttiden av det (kl. 12 dagen innan).
+      contact_head_of_cafe: Om du verkligen behöver avanmäla dig, skriv då till Cafémästaren på cafe@fsektionen.se
diff --git a/config/locales/views/proposals/proposals.sv.yml b/config/locales/views/proposals/proposals.sv.yml
index 481e775f7..ac1adc080 100644
--- a/config/locales/views/proposals/proposals.sv.yml
+++ b/config/locales/views/proposals/proposals.sv.yml
@@ -5,6 +5,7 @@ sv:
       create_motion: Skapa motion!
       description: Motioner skrivs till terminsmöte för att kunna påverka sektionens verksamhet. Här finns en mall för att skapa motioner.
       do_not_forget_to_copy: Glöm inte att kopiera din text då och då så att den inte försvinner om du skulle råka ladda om sidan.
+      do_not_forget_to_send: Observera att du fortfarande måste skicka in din motion till sekreteraren (på sekreterare@fsektionen.se).
       i_am_proposal_machine: Jag är en motionsmaskin. Här kan du enkelt fylla i dina åsikter så gör jag en fin motion åt dig.
       keywords:
         - motion