diff --git a/.htaccess b/.htaccess
index 255e6fa6c..44ee30c48 100755
--- a/.htaccess
+++ b/.htaccess
@@ -13,7 +13,7 @@ RewriteRule ^(.*)$ index.php?/$1 [L]
 # disable directory browsing
 # For security reasons, Option all cannot be overridden.
 #Options All -Indexes
-Options ExecCGI Includes IncludesNOEXEC SymLinksIfOwnerMatch -Indexes
+Options +ExecCGI +Includes +IncludesNOEXEC +SymLinksIfOwnerMatch -Indexes
 
 # prevent folder listing
 IndexIgnore *
@@ -29,4 +29,4 @@ IndexIgnore *
  order allow,deny
  deny from all
  satisfy All
-</Files>
\ No newline at end of file
+</Files>
diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php
index cef98ebf4..e573d4285 100644
--- a/system/libraries/Pagination.php
+++ b/system/libraries/Pagination.php
@@ -497,7 +497,7 @@ class CI_Pagination {
 		{
 			$this->cur_page = $this->CI->input->get($this->query_string_segment);
 		}
-		else
+		else if (!$this->cur_page)
 		{
 			// Default to the last segment number if one hasn't been defined.
 			if ($this->uri_segment === 0)