diff --git a/app/src/main/java/com/afollestad/nocknock/ui/viewsite/ViewSiteActivity.kt b/app/src/main/java/com/afollestad/nocknock/ui/viewsite/ViewSiteActivity.kt
index 6d131ad..2aa312c 100644
--- a/app/src/main/java/com/afollestad/nocknock/ui/viewsite/ViewSiteActivity.kt
+++ b/app/src/main/java/com/afollestad/nocknock/ui/viewsite/ViewSiteActivity.kt
@@ -84,18 +84,18 @@ class ViewSiteActivity : DarkModeSwitchActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_viewsite)
-    setupUi()
-    setupValidation()
-
-    lifecycle.run {
-      addObserver(viewModel)
-      addObserver(statusUpdateReceiver)
-    }
 
     // Populate view model with initial data
     val model = intent.getSerializableExtra(KEY_SITE) as Site
     viewModel.setModel(model)
 
+    setupUi()
+    setupValidation()
+    lifecycle.run {
+      addObserver(viewModel)
+      addObserver(statusUpdateReceiver)
+    }
+
     // Loading
     loadingProgress.observe(this, viewModel.onIsLoading())
 
diff --git a/app/src/main/java/com/afollestad/nocknock/ui/viewsite/ViewSiteViewModelExt.kt b/app/src/main/java/com/afollestad/nocknock/ui/viewsite/ViewSiteViewModelExt.kt
index 3864984..800f235 100644
--- a/app/src/main/java/com/afollestad/nocknock/ui/viewsite/ViewSiteViewModelExt.kt
+++ b/app/src/main/java/com/afollestad/nocknock/ui/viewsite/ViewSiteViewModelExt.kt
@@ -55,7 +55,11 @@ fun ViewSiteViewModel.setModel(site: Site) {
   setCheckInterval(settings.validationIntervalMs)
   setRetryPolicy(site.retryPolicy)
   headers.value = site.headers
-  certificateUri.value = settings.certificate
+  if (settings.certificate == "null") {
+    certificateUri.value = ""
+  } else {
+    certificateUri.value = settings.certificate
+  }
 
   this.disabled.value = settings.disabled
   this.lastResult.value = site.lastResult
@@ -65,22 +69,22 @@ private fun ViewSiteViewModel.setCheckInterval(interval: Long) {
   when {
     interval >= WEEK -> {
       checkIntervalValue.value =
-          getIntervalFromUnit(interval, WEEK)
+        getIntervalFromUnit(interval, WEEK)
       checkIntervalUnit.value = WEEK
     }
     interval >= DAY -> {
       checkIntervalValue.value =
-          getIntervalFromUnit(interval, DAY)
+        getIntervalFromUnit(interval, DAY)
       checkIntervalUnit.value = DAY
     }
     interval >= HOUR -> {
       checkIntervalValue.value =
-          getIntervalFromUnit(interval, HOUR)
+        getIntervalFromUnit(interval, HOUR)
       checkIntervalUnit.value = HOUR
     }
     interval >= MINUTE -> {
       checkIntervalValue.value =
-          getIntervalFromUnit(interval, MINUTE)
+        getIntervalFromUnit(interval, MINUTE)
       checkIntervalUnit.value = MINUTE
     }
     else -> {