diff --git a/azurerm/resource_arm_iothub.go b/azurerm/resource_arm_iothub.go
index 4a6bbd7d0849..d4fb8cee81af 100755
--- a/azurerm/resource_arm_iothub.go
+++ b/azurerm/resource_arm_iothub.go
@@ -165,6 +165,7 @@ func resourceArmIotHub() *schema.Resource {
 
 								return false
 							},
+							Sensitive: true,
 						},
 						"name": {
 							Type:         schema.TypeString,
@@ -745,6 +746,8 @@ func flattenIoTHubEndpoint(input *devices.RoutingProperties) []interface{} {
 					output["name"] = *name
 				}
 
+				output["type"] = "AzureIotHub.ServiceBusQueue"
+
 				results = append(results, output)
 			}
 		}
@@ -760,6 +763,8 @@ func flattenIoTHubEndpoint(input *devices.RoutingProperties) []interface{} {
 					output["name"] = *name
 				}
 
+				output["type"] = "AzureIotHub.ServiceBusTopic"
+
 				results = append(results, output)
 			}
 		}
@@ -775,6 +780,8 @@ func flattenIoTHubEndpoint(input *devices.RoutingProperties) []interface{} {
 					output["name"] = *name
 				}
 
+				output["type"] = "AzureIotHub.EventHub"
+
 				results = append(results, output)
 			}
 		}