diff --git a/htdocs/application/config/stikked.php.dist b/htdocs/application/config/stikked.php.dist
index ffe1d4f..d3c00c9 100644
--- a/htdocs/application/config/stikked.php.dist
+++ b/htdocs/application/config/stikked.php.dist
@@ -87,6 +87,7 @@ $config['cron_key'] = '';
 $config['yourls_url'] = '';
 $config['yourls_signature'] = '';
 $config['gwgd_url'] = '';
+$config['shorturl_selected'] = false;
 
 /**
  * Credentials for the backup URL
diff --git a/htdocs/application/controllers/main.php b/htdocs/application/controllers/main.php
index acc6e8f..65aa2ee 100644
--- a/htdocs/application/controllers/main.php
+++ b/htdocs/application/controllers/main.php
@@ -315,6 +315,12 @@ class Main extends CI_Controller
 				$this->db_session->set_userdata('expire', $default_expiration);
 			}
 			
+			if (!$this->db_session->userdata('snipurl')) 
+			{
+				$shorturl_selected = config_item('shorturl_selected');
+				$this->db_session->set_userdata('snipurl', $shorturl_selected);
+			}
+			
 			if ($this->db_session->flashdata('settings_changed')) 
 			{
 				$data['status_message'] = 'Settings successfully changed';