diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php
index 3eb3449854..967780745e 100644
--- a/phpBB/includes/acp/acp_storage.php
+++ b/phpBB/includes/acp/acp_storage.php
@@ -153,7 +153,7 @@ class acp_storage
 				break;
 			}
 
-			if (!check_form_key($form_key) || !check_link_hash($this->request->variable('hash', ''), 'acp_storage'))
+			if (!check_link_hash($this->request->variable('hash', ''), 'acp_storage'))
 			{
 				trigger_error($this->user->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING);
 			}
@@ -163,8 +163,9 @@ class acp_storage
 			foreach ($this->state['storages'] as $storage_name => $storage_options)
 			{
 				// Skip storages that have already moved files
-				if ($this->state['storage_index'] > $i++)
+				if ($this->state['storage_index'] > $i)
 				{
+					$i++;
 					continue;
 				}
 
@@ -209,8 +210,9 @@ class acp_storage
 				foreach ($this->state['storages'] as $storage_name => $storage_options)
 				{
 					// Skip storages that have already moved files
-					if ($this->state['remove_storage_index'] > $i++)
+					if ($this->state['remove_storage_index'] > $i)
 					{
+						$i++;
 						continue;
 					}
 
diff --git a/phpBB/language/en/acp/storage.php b/phpBB/language/en/acp/storage.php
index 7c921b46e2..892aa42e72 100644
--- a/phpBB/language/en/acp/storage.php
+++ b/phpBB/language/en/acp/storage.php
@@ -54,8 +54,8 @@ $lang = array_merge($lang, array(
 	'START_UPDATING_EXPLAIN'				=> 'Start the storage update process',
 	'CONTINUE_UPDATING'						=> 'Continue previous update process',
 	'CONTINUE_UPDATING_EXPLAIN'				=> 'An update process has been started. In order to access the storage settings page you will have to complete it or cancel it.',
-	'SORAGE_UPDATE_REDIRECT'				=> 'Files of %s (%d/%d) are being moved.<br />',
-	'SORAGE_UPDATE_REMOVE_REDIRECT'			=> 'Files of old %s (%d/%d) are being removed.<br />',
+	'STORAGE_UPDATE_REDIRECT'				=> 'Files of %s (%d/%d) are being moved.<br />',
+	'STORAGE_UPDATE_REMOVE_REDIRECT'		=> 'Files of old %s (%d/%d) are being removed.<br />',
 
 	// Template progress bar
 	'STORAGE_UPDATE_IN_PROGRESS'			=> 'Storage update in progress',