diff --git a/app/corpora/routes.py b/app/corpora/routes.py
index 5c857e6186edaa1a6a7d1498fc4f247c1a6fa32a..bd65bfca42f3e1da4dd8c0b10100f1350118ae4d 100644
--- a/app/corpora/routes.py
+++ b/app/corpora/routes.py
@@ -76,6 +76,7 @@ def corpus(corpus_id):
         return redirect(url_for('.corpus', corpus_id=corpus.id))
     now = datetime.utcnow()
     payload = {
+            'exp': now + timedelta(weeks=1),
             'iat': now,
             'iss': current_app.config['SERVER_NAME'],
             'sub': corpus.hashid
diff --git a/app/main/routes.py b/app/main/routes.py
index aed63853844745d68cd308af7178debcc21b5482..dd4a50074ac1052936967c8dd8d5a82375aa6f52 100644
--- a/app/main/routes.py
+++ b/app/main/routes.py
@@ -33,7 +33,7 @@ def dashboard():
     ]
     corpora = [
         c.to_json_serializeable() for c
-        in Corpus.query.filter(Corpus.is_public == True).all()
+        in Corpus.query.filter(Corpus.is_public == True, Corpus.user != current_user).all()
     ]
     return render_template('main/dashboard.html.j2', title='Dashboard', users=users, corpora=corpora)
 
diff --git a/app/templates/corpora/corpus_public.html.j2 b/app/templates/corpora/corpus_public.html.j2
index 1668e55c7bfbbfaaa5338aec2573032ce3179ec7..a489e27a4a7deb6d341c455bd2e0387d5e931dce 100644
--- a/app/templates/corpora/corpus_public.html.j2
+++ b/app/templates/corpora/corpus_public.html.j2
@@ -18,7 +18,7 @@
             {% endif %}
           </a>
           {% if corpus.status.name in ['BUILT', 'STARTING_ANALYSIS_SESSION', 'RUNNING_ANALYSIS_SESSION', 'CANCELING_ANALYSIS_SESSION'] and current_user.is_following_corpus(corpus) %}
-          <a class="btn waves-effect waves-light" href="{{ url_for('corpora.analyse_corpus', corpus_id=corpus.id) }}">Analyse</a>
+          <a class="btn waves-effect waves-light" href="{{ url_for('corpora.analyse_corpus', corpus_id=corpus.id) }}">Analyze</a>
           {% endif %}
         </div>
       </div>
@@ -44,12 +44,14 @@
           </div>
         </div>
       </div>
+      {% if current_user.is_following_corpus(corpus) %}
       <div class="card">
         <div class="card-content">
           <span class="card-title" id="files">Corpus files</span>
           <div class="corpus-file-list no-autoinit" data-user-id="{{ corpus.user.hashid }}" data-corpus-id="{{ corpus.hashid }}"></div>
         </div>
       </div>
+      {% endif %}
     </div>
     </div>
   </div>
@@ -59,8 +61,10 @@
 {% block scripts %}
 {{ super() }}
 <script>
-  let corpusFileList = new PublicCorpusFileList(document.querySelector('.corpus-file-list'));
-  corpusFileList.add({{ corpus_files|tojson }});
+  {% if current_user.is_following_corpus(corpus) %}
+    let corpusFileList = new PublicCorpusFileList(document.querySelector('.corpus-file-list'));
+    corpusFileList.add({{ corpus_files|tojson }});
+  {% endif %}
 
   let corpusFollowingRequest = document.querySelector('#follow-corpus-request');