Index: akismet.php
===================================================================
--- akismet.php	(revision 68182)
+++ akismet.php	(working copy)
@@ -37,9 +37,17 @@
 }
 
 function akismet_config_page() {
-	if ( function_exists('add_submenu_page') )
-		add_submenu_page('plugins.php', __('Akismet Configuration'), __('Akismet Configuration'), 'manage_options', 'akismet-key-config', 'akismet_conf');
+	if ( current_user_can('manage_options') && function_exists('add_submenu_page') ) {
+			add_submenu_page('plugins.php', __('Akismet Configuration'), __('Akismet Configuration'), 'manage_options', 'akismet-key-config', 'akismet_conf');
+			$plugin = plugin_basename(__FILE__);
+			add_filter("plugin_action_links_$plugin", 'akismet_filter_plugin_actions' );
+	}
+}
 
+function akismet_filter_plugin_actions( $links ) {
+	$settings_link = '<a href="plugins.php?page=akismet-key-config">' . __( 'Settings' ) . '</a>';
+	array_unshift( $links, $settings_link );
+	return $links;
 }
 
 function akismet_conf() {