diff --git a/wortschlucker/src/wortschlucker.py b/wortschlucker/src/wortschlucker.py
index 25f5e14..8a54b63 100755
--- a/wortschlucker/src/wortschlucker.py
+++ b/wortschlucker/src/wortschlucker.py
@@ -1052,7 +1052,7 @@ def show_one_poll(bobo_request, poll_hash_for_admin=None, poll_hash=None,
     try:
         count = int(count)
     except ValueError:
-        count = 100
+        count = 50
     count = max(1, min(count, 1000))
     try:
         page = int(page)
@@ -1063,7 +1063,7 @@ def show_one_poll(bobo_request, poll_hash_for_admin=None, poll_hash=None,
     poll_id = get_poll_id(poll_hash)
     if not poll_id is None:
         poll = Poll.get(poll_id)
-        page = min(page, (poll.get_num_of_submissions() - 1) / count)
+        page = min(page, 1 + (poll.get_num_of_submissions() - 1) / count)
         value_dict["poll"] = poll
         value_dict["page"] = page
         value_dict["count"] = count