diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94befb13..7fd0ce0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## Added
 
 - Vector maps are supported in non-self-hosted mode.
-- Credentials for Sidekiq UI are now being set via environment variables: `SIDEKIQ_USERNAME` and `SIDEKIQ_PASSWORD`. Default credentials are `sidekiq` and `password`.
+- Credentials for Sidekiq UI are now being set via environment variables: `SIDEKIQ_USERNAME` and `SIDEKIQ_PASSWORD`. Default credentials are `sidekiq` and `password`. If you don't set them, in self-hosted mode, Sidekiq UI will not be protected by basic auth.
 - New import page now shows progress of the upload.
 
 ## Changed
diff --git a/config/routes.rb b/config/routes.rb
index a8e5a20d..01164189 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -7,15 +7,17 @@ Rails.application.routes.draw do
   mount Rswag::Api::Engine => '/api-docs'
   mount Rswag::Ui::Engine => '/api-docs'
 
-  Sidekiq::Web.use(Rack::Auth::Basic) do |username, password|
-    ActiveSupport::SecurityUtils.secure_compare(
-      ::Digest::SHA256.hexdigest(username),
-      ::Digest::SHA256.hexdigest(ENV['SIDEKIQ_USERNAME'])
-    ) &
+  unless DawarichSettings.self_hosted?
+    Sidekiq::Web.use(Rack::Auth::Basic) do |username, password|
       ActiveSupport::SecurityUtils.secure_compare(
-        ::Digest::SHA256.hexdigest(password),
-        ::Digest::SHA256.hexdigest(ENV['SIDEKIQ_PASSWORD'])
-      )
+        ::Digest::SHA256.hexdigest(username),
+        ::Digest::SHA256.hexdigest(ENV['SIDEKIQ_USERNAME'])
+      ) &
+        ActiveSupport::SecurityUtils.secure_compare(
+          ::Digest::SHA256.hexdigest(password),
+          ::Digest::SHA256.hexdigest(ENV['SIDEKIQ_PASSWORD'])
+        )
+    end
   end
 
   authenticate :user, lambda { |u|
diff --git a/lib/tasks/points.rake b/lib/tasks/points.rake
index 30aad8e6..7e3a1993 100644
--- a/lib/tasks/points.rake
+++ b/lib/tasks/points.rake
@@ -5,7 +5,9 @@ namespace :points do
   task migrate_to_lonlat: :environment do
     puts 'Updating points to use lonlat...'
 
-    points = Point.where(longitude: nil, latitude: nil).select(:id, :longitude, :latitude, :raw_data, :user_id)
+    points =
+      Point.where(longitude: nil, latitude: nil)
+           .select(:id, :longitude, :latitude, :raw_data, :user_id, :timestamp)
 
     points.find_each do |point|
       Points::RawDataLonlatExtractor.new(point).call