diff --git a/src/xfpm-button.c b/src/xfpm-button.c
index 0ac31e8930d145ea51b03708daa657a875b61382..2a2bced463f9951dac0636fbc71b724a6e9edff0 100644
--- a/src/xfpm-button.c
+++ b/src/xfpm-button.c
@@ -322,12 +322,11 @@ _proccess_action(XfpmButton *bt,XfpmActionRequest action)
     }
     else if ( action == XFPM_DO_SHUTDOWN )
     {
-        XFPM_DEBUG("Processing\n");
         XfpmButtonPrivate *priv;
         priv = XFPM_BUTTON_GET_PRIVATE(bt);
         g_signal_handler_block(priv->hal,priv->handler_id);
     
-        g_signal_emit(G_OBJECT(bt),signals[XFPM_ACTION_REQUEST],0,XFPM_DO_HIBERNATE,FALSE);
+        g_signal_emit(G_OBJECT(bt),signals[XFPM_ACTION_REQUEST],0,XFPM_DO_SHUTDOWN,FALSE);
         
         g_timeout_add(10,(GSourceFunc)_unblock_handler,priv);
         
diff --git a/src/xfpm-driver.c b/src/xfpm-driver.c
index 5f9eb2f6a6075640898f17d83a55e724f0b1a2de..8d499124ddb28c01373a6ee6e98415a88833a4ae 100644
--- a/src/xfpm-driver.c
+++ b/src/xfpm-driver.c
@@ -661,7 +661,7 @@ xfpm_driver_do_shutdown(gpointer data)
     if (!xfpm_hal_shutdown(priv->hal))
     {
 #ifdef HAVE_LIBNOTIFY        
-         xfpm_driver_report_sleep_errors(drv,"gpm-hibernate",_("System failed to shutdown"));
+         xfpm_driver_report_sleep_errors(drv,"gpm-ac-adapter",_("System failed to shutdown"));
 #endif         
     }
     
@@ -722,6 +722,7 @@ xfpm_driver_handle_action_request(GObject *object,XfpmActionRequest action,
     }
 
     /* Block any other event here */    
+    /*
     priv->accept_sleep_request = FALSE;    
     
     switch ( action )
@@ -737,7 +738,7 @@ xfpm_driver_handle_action_request(GObject *object,XfpmActionRequest action,
             break;    
         default:
             break;
-    }        
+    } */       
     
 }