diff --git a/opsgenie/client.go b/opsgenie/client.go
index 0083fec5..e0a58f87 100644
--- a/opsgenie/client.go
+++ b/opsgenie/client.go
@@ -17,13 +17,6 @@ type OnCallResponse struct {
 type OnCallData struct {
 	Recipients []string `json:"onCallRecipients"`
 	Parent     Parent   `json:"_parent"`
-	Users      []OnCallUserData
-}
-
-type OnCallUserData struct {
-	ID       string `json:"id"`
-	Username string `json:"username"`
-	FullName string `json:"fullName"`
 }
 
 type Parent struct {
diff --git a/opsgenie/widget.go b/opsgenie/widget.go
index 5e626197..dfcf3c55 100644
--- a/opsgenie/widget.go
+++ b/opsgenie/widget.go
@@ -61,9 +61,20 @@ func (widget *Widget) contentFrom(onCallResponse *OnCallResponse) string {
 
 	for _, data := range onCallResponse.OnCallData {
 		str = str + fmt.Sprintf(" [green]%s[white]\n", data.Parent.Name)
-		str = str + fmt.Sprintf(" %s\n", strings.Join(data.Recipients, ", "))
+		str = str + fmt.Sprintf(" %s\n", strings.Join(widget.namesFromEmails(data.Recipients), ", "))
 		str = str + "\n"
 	}
 
 	return str
 }
+
+func (widget *Widget) namesFromEmails(emails []string) []string {
+	names := []string{}
+
+	for _, email := range emails {
+		parts := strings.Split(email, "@")
+		names = append(names, strings.Title(strings.Replace(parts[0], ".", " ", -1)))
+	}
+
+	return names
+}