diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm
index 5e921a6466d..c2307f59311 100644
--- a/code/modules/telesci/telepad.dm
+++ b/code/modules/telesci/telepad.dm
@@ -28,7 +28,7 @@
 	efficiency = E
 
 /obj/machinery/telepad/attackby(obj/item/I, mob/user, params)
-	if(default_deconstruction_screwdriver(user, "pad-idle-o", "pad-idle", I))
+	if(default_deconstruction_screwdriver(user, I))
 		return
 
 	if(panel_open)
@@ -36,9 +36,18 @@
 			var/obj/item/device/multitool/M = I
 			M.buffer = src
 			user << "<span class='caution'>You save the data in the [I.name]'s buffer.</span>"
+	else
+		if(istype(I, /obj/item/device/multitool))
+			user << "<span class='caution'>You should open [src]'s maintenance panel first.</span>"
 
-	default_deconstruction_crowbar(I)
+	default_deconstruction_crowbar(user, I)
 
+/obj/machinery/telepad/update_icon()
+	switch (panel_open)
+		if (1)
+			icon_state = "pad-idle-o"
+		if (0)
+			icon_state = "pad-idle"
 
 //CARGO TELEPAD//
 /obj/machinery/telepad_cargo
diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm
index db1c7b335a8..094cb38ee1b 100644
--- a/code/modules/telesci/telesci_computer.dm
+++ b/code/modules/telesci/telesci_computer.dm
@@ -87,7 +87,7 @@
 	var/t
 	if(!telepad)
 		in_use = 0     //Yeah so if you deconstruct teleporter while its in the process of shooting it wont disable the console
-		t += "<div class='statusDisplay'>No telepad located. <BR>Please add telepad data.</div><BR>"
+		t += "<div class='statusDisplay'>No telepad located. <BR>Please add telepad data via use of Multitool.</div><BR>"
 	else
 		if(inserted_gps)
 			t += "<A href='?src=\ref[src];ejectGPS=1'>Eject GPS</A>"