diff --git a/fblikebutton.module b/fblikebutton.module
index 0992cb4..adb2d02 100644
--- a/fblikebutton.module
+++ b/fblikebutton.module
@@ -131,10 +131,10 @@ function fblikebutton_block_configure($delta = '') {
   $form = array();
   if ($delta == 'fblikebutton_block') {
     $form['fblikebutton_block_url'] = array(
-      '#title' => t('Homepage URL'),
+      '#title' => t('URL to Like'),
       '#type' => 'textfield',
-      '#default_value' => variable_get('fblikebutton_block_url', $base_url),
-      '#description' => t('URL of your homepage to like'),
+      '#default_value' => NULL,
+      '#description' => t('URL of your homepage to like (Leave this blank if you want to use the current URL as the URL to like)'),
     );
     $form['block'] = array(
       '#type' => 'fieldset',
@@ -234,6 +234,8 @@ function fblikebutton_block_save($delta = '', $edit = array()) {
  */
 function fblikebutton_block_view($delta = '') {
   global $base_url;
+  $current_url = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'] . request_uri();
+
   $block = array();
   switch ($delta) {
     case 'fblikebutton_block':
@@ -250,6 +252,9 @@ function fblikebutton_block_view($delta = '') {
         'other_css' => variable_get('fblikebutton_bl_iframe_css', ''),
         'language' => variable_get('fblikebutton_bl_language', 'en_US'),
       );
+      if ($addr == NULL) {
+        $addr = $current_url;
+      }
       $block['content'] = _fblikebutton_field($addr, $conf);
   }
   return $block;